Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.local
commit
aeacebb3d7
249 changed files with 4856 additions and 3176 deletions
@ -0,0 +1,48 @@ |
||||
name: CSS Linting |
||||
on: |
||||
push: |
||||
branches-ignore: |
||||
- 'dependabot/**' |
||||
paths: |
||||
- 'package.json' |
||||
- 'yarn.lock' |
||||
- '.prettier*' |
||||
- 'stylelint.config.js' |
||||
- '**/*.css' |
||||
- '**/*.scss' |
||||
- '.github/workflows/lint-css.yml' |
||||
- '.github/stylelint-matcher.json' |
||||
|
||||
pull_request: |
||||
paths: |
||||
- 'package.json' |
||||
- 'yarn.lock' |
||||
- '.prettier*' |
||||
- 'stylelint.config.js' |
||||
- '**/*.css' |
||||
- '**/*.scss' |
||||
- '.github/workflows/lint-css.yml' |
||||
- '.github/stylelint-matcher.json' |
||||
|
||||
jobs: |
||||
lint: |
||||
runs-on: ubuntu-latest |
||||
|
||||
steps: |
||||
- name: Clone repository |
||||
uses: actions/checkout@v3 |
||||
|
||||
- name: Set up Node.js |
||||
uses: actions/setup-node@v3 |
||||
with: |
||||
cache: yarn |
||||
|
||||
- name: Install all yarn packages |
||||
run: yarn --frozen-lockfile |
||||
|
||||
- uses: xt0rted/stylelint-problem-matcher@v1 |
||||
|
||||
- run: echo "::add-matcher::.github/stylelint-matcher.json" |
||||
|
||||
- name: Stylelint |
||||
run: yarn test:lint:sass |
@ -0,0 +1,40 @@ |
||||
name: JavaScript Linting |
||||
on: |
||||
push: |
||||
branches-ignore: |
||||
- 'dependabot/**' |
||||
paths: |
||||
- 'package.json' |
||||
- 'yarn.lock' |
||||
- '.prettier*' |
||||
- '.eslint*' |
||||
- '**/*.js' |
||||
- '.github/workflows/lint-js.yml' |
||||
|
||||
pull_request: |
||||
paths: |
||||
- 'package.json' |
||||
- 'yarn.lock' |
||||
- '.prettier*' |
||||
- '.eslint*' |
||||
- '**/*.js' |
||||
- '.github/workflows/lint-js.yml' |
||||
|
||||
jobs: |
||||
lint: |
||||
runs-on: ubuntu-latest |
||||
|
||||
steps: |
||||
- name: Clone repository |
||||
uses: actions/checkout@v3 |
||||
|
||||
- name: Set up Node.js |
||||
uses: actions/setup-node@v3 |
||||
with: |
||||
cache: yarn |
||||
|
||||
- name: Install all yarn packages |
||||
run: yarn --frozen-lockfile |
||||
|
||||
- name: ESLint |
||||
run: yarn test:lint:js |
@ -0,0 +1,41 @@ |
||||
name: Ruby Linting |
||||
on: |
||||
push: |
||||
branches-ignore: |
||||
- 'dependabot/**' |
||||
paths: |
||||
- 'Gemfile*' |
||||
- '.rubocop.yml' |
||||
- '**/*.rb' |
||||
- '**/*.rake' |
||||
- '.github/workflows/lint-ruby.yml' |
||||
|
||||
pull_request: |
||||
paths: |
||||
- 'Gemfile*' |
||||
- '.rubocop.yml' |
||||
- '**/*.rb' |
||||
- '**/*.rake' |
||||
- '.github/workflows/lint-ruby.yml' |
||||
|
||||
jobs: |
||||
lint: |
||||
runs-on: ubuntu-latest |
||||
steps: |
||||
- name: Checkout Code |
||||
uses: actions/checkout@v3 |
||||
with: |
||||
fetch-depth: 0 |
||||
|
||||
- name: Set-up RuboCop Problem Mathcher |
||||
uses: r7kamura/rubocop-problem-matchers-action@v1 |
||||
|
||||
- name: Run rubocop |
||||
uses: github/super-linter@v4 |
||||
env: |
||||
DEFAULT_BRANCH: main |
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
||||
LINTER_RULES_PATH: . |
||||
RUBY_CONFIG_FILE: .rubocop.yml |
||||
VALIDATE_ALL_CODEBASE: false |
||||
VALIDATE_RUBY: true |
@ -1,83 +0,0 @@ |
||||
--- |
||||
################################# |
||||
################################# |
||||
## Super Linter GitHub Actions ## |
||||
################################# |
||||
################################# |
||||
name: Lint Code Base |
||||
|
||||
# |
||||
# Documentation: |
||||
# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions |
||||
# |
||||
|
||||
############################# |
||||
# Start the job on all push # |
||||
############################# |
||||
on: |
||||
push: |
||||
branches-ignore: [main] |
||||
# Remove the line above to run when pushing to master |
||||
pull_request: |
||||
branches: [main] |
||||
|
||||
############### |
||||
# Set the Job # |
||||
############### |
||||
permissions: |
||||
checks: write |
||||
contents: read |
||||
pull-requests: write |
||||
statuses: write |
||||
|
||||
jobs: |
||||
build: |
||||
# Name the Job |
||||
name: Lint Code Base |
||||
# Set the agent to run on |
||||
runs-on: ubuntu-latest |
||||
|
||||
################## |
||||
# Load all steps # |
||||
################## |
||||
steps: |
||||
########################## |
||||
# Checkout the code base # |
||||
########################## |
||||
- name: Checkout Code |
||||
uses: actions/checkout@v3 |
||||
with: |
||||
# Full git history is needed to get a proper list of changed files within `super-linter` |
||||
fetch-depth: 0 |
||||
|
||||
- name: Set-up Node.js |
||||
uses: actions/setup-node@v3 |
||||
with: |
||||
node-version-file: .nvmrc |
||||
cache: yarn |
||||
- name: Install dependencies |
||||
run: yarn install --frozen-lockfile |
||||
- name: Set-up RuboCop Problem Mathcher |
||||
uses: r7kamura/rubocop-problem-matchers-action@v1 |
||||
- name: Set-up Stylelint Problem Matcher |
||||
uses: xt0rted/stylelint-problem-matcher@v1 |
||||
# https://github.com/xt0rted/stylelint-problem-matcher/issues/360 |
||||
- run: echo "::add-matcher::.github/stylelint-matcher.json" |
||||
|
||||
################################ |
||||
# Run Linter against code base # |
||||
################################ |
||||
- name: Lint Code Base |
||||
uses: github/super-linter@v4 |
||||
env: |
||||
CSS_FILE_NAME: stylelint.config.js |
||||
DEFAULT_BRANCH: main |
||||
NO_COLOR: 1 # https://github.com/xt0rted/stylelint-problem-matcher/issues/360 |
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
||||
JAVASCRIPT_ES_CONFIG_FILE: .eslintrc.js |
||||
LINTER_RULES_PATH: . |
||||
RUBY_CONFIG_FILE: .rubocop.yml |
||||
VALIDATE_ALL_CODEBASE: false |
||||
VALIDATE_CSS: true |
||||
VALIDATE_JAVASCRIPT_ES: true |
||||
VALIDATE_RUBY: true |
@ -1,3 +1,2 @@ |
||||
import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only'; |
||||
import 'intersection-observer'; |
||||
import 'requestidlecallback'; |
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue