diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-06-21 08:28:59 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-06-21 08:28:59 +0200 |
commit | 0e74d4da592d6ac5e3c52b0f9c6b1906376aa707 (patch) | |
tree | 66ae31bd3fd0228ebc6f92325cf43c7f02e4263d /.github | |
parent | 7a75bce1b43df290baf6842e2bb3d3eb0acd76d5 (diff) | |
parent | 27f41768e8d66d97c8d705d764e534e52ea13af9 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.
Diffstat (limited to '.github')
-rw-r--r-- | .github/stylelint-matcher.json | 21 | ||||
-rw-r--r-- | .github/workflows/build-image.yml | 43 | ||||
-rw-r--r-- | .github/workflows/check-i18n.yml | 2 | ||||
-rw-r--r-- | .github/workflows/linter.yml | 12 |
4 files changed, 34 insertions, 44 deletions
diff --git a/.github/stylelint-matcher.json b/.github/stylelint-matcher.json new file mode 100644 index 000000000..cdfd4086b --- /dev/null +++ b/.github/stylelint-matcher.json @@ -0,0 +1,21 @@ +{ + "problemMatcher": [ + { + "owner": "stylelint", + "pattern": [ + { + "regexp": "^([^\\s].*)$", + "file": 1 + }, + { + "regexp": "^\\s+((\\d+):(\\d+))?\\s+(✖|×)\\s+(.*)\\s{2,}(.*)$", + "line": 2, + "column": 3, + "message": 5, + "code": 6, + "loop": true + } + ] + } + ] +} diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml deleted file mode 100644 index 880fdfac9..000000000 --- a/.github/workflows/build-image.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Build container image -on: - workflow_dispatch: - push: - branches: - - 'main' - tags: - - '*' - pull_request: - paths: - - .github/workflows/build-image.yml - - Dockerfile -jobs: - build-image: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: docker/setup-qemu-action@v1 - - uses: docker/setup-buildx-action@v1 - - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - if: github.event_name != 'pull_request' - - uses: docker/metadata-action@v3 - id: meta - with: - images: ghcr.io/${{ github.repository_owner }}/mastodon - flavor: | - latest=true - tags: | - type=edge,branch=main - type=match,pattern=v(.*),group=0 - type=ref,event=pr - - uses: docker/build-push-action@v2 - with: - context: . - platforms: linux/amd64,linux/arm64 - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/mastodon:latest - cache-to: type=inline diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml index be38a096d..1c60515f8 100644 --- a/.github/workflows/check-i18n.yml +++ b/.github/workflows/check-i18n.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install system dependencies run: | sudo apt-get update diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index fd535ea9a..f77a9720e 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -50,8 +50,19 @@ jobs: # 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: 16.x + cache: yarn - name: Intall 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 # @@ -61,6 +72,7 @@ jobs: 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: . |