From 684b7c7c5796d890a07139d4fce65db0c9b7e37f Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Wed, 3 Jun 2026 20:59:48 +0200 Subject: [PATCH 1/7] separate erb lint workflow --- .github/workflows/erb-lint-core.yml | 31 +++++++++++++++++++++++++++++ .github/workflows/rubocop-core.yml | 8 -------- 2 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/erb-lint-core.yml diff --git a/.github/workflows/erb-lint-core.yml b/.github/workflows/erb-lint-core.yml new file mode 100644 index 00000000000..09d63bc1550 --- /dev/null +++ b/.github/workflows/erb-lint-core.yml @@ -0,0 +1,31 @@ +name: ERB lint + +on: + pull_request: + paths: + - '**/*.erb' + - '.erb_lint.yml' + - '.erb_linters/**' + +jobs: + erb-lint: + name: ERB lint + runs-on: ubuntu-latest + permissions: + contents: read + checks: write + steps: + - name: Checkout code + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + with: + persist-credentials: false + - name: Set up Ruby + uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1 + - name: Install erb_lint + run: gem install -N erb_lint erblint-github + - name: Run erb-lint + uses: tk0miya/action-erblint@44c5fe3552356fe8bff23f30d534aa4258aa3f7b # v1 + with: + github_token: ${{ secrets.github_token }} + reporter: github-pr-check + fail_on_error: true diff --git a/.github/workflows/rubocop-core.yml b/.github/workflows/rubocop-core.yml index 11e8d647c7f..7dad07c9459 100644 --- a/.github/workflows/rubocop-core.yml +++ b/.github/workflows/rubocop-core.yml @@ -34,11 +34,3 @@ jobs: rubocop-rspec_rails:gemfile reporter: github-pr-check only_changed: true - - name: Install erb_lint - run: gem install -N erb_lint erblint-github - - name: Run erb-lint - uses: tk0miya/action-erblint@44c5fe3552356fe8bff23f30d534aa4258aa3f7b # v1 - with: - github_token: ${{ secrets.github_token }} - reporter: github-pr-check - fail_on_error: true From bbca8a5c5c93f1cfebc4216d7736f74023be779f Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Thu, 4 Jun 2026 13:48:56 +0200 Subject: [PATCH 2/7] full version in comment of actions/checkout --- .github/workflows/erb-lint-core.yml | 2 +- .github/workflows/eslint-core.yml | 2 +- .github/workflows/rubocop-core.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/erb-lint-core.yml b/.github/workflows/erb-lint-core.yml index 09d63bc1550..e2fb8b58329 100644 --- a/.github/workflows/erb-lint-core.yml +++ b/.github/workflows/erb-lint-core.yml @@ -16,7 +16,7 @@ jobs: checks: write steps: - name: Checkout code - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false - name: Set up Ruby diff --git a/.github/workflows/eslint-core.yml b/.github/workflows/eslint-core.yml index 19e26516290..8219ad24b75 100644 --- a/.github/workflows/eslint-core.yml +++ b/.github/workflows/eslint-core.yml @@ -17,7 +17,7 @@ jobs: contents: read checks: write steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: fetch-depth: 0 persist-credentials: false diff --git a/.github/workflows/rubocop-core.yml b/.github/workflows/rubocop-core.yml index 7dad07c9459..c43990206af 100644 --- a/.github/workflows/rubocop-core.yml +++ b/.github/workflows/rubocop-core.yml @@ -14,7 +14,7 @@ jobs: checks: write steps: - name: Checkout code - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false - name: Set up Ruby From 46aa3fed2a0521312142bbbd3a62f24aa69e17e9 Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Wed, 3 Jun 2026 21:31:45 +0200 Subject: [PATCH 3/7] fix yamllint job name and workflow permissions (checks is needed) --- .github/workflows/yamllint-core.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/yamllint-core.yml b/.github/workflows/yamllint-core.yml index 496f8006a1a..cc3ba016993 100644 --- a/.github/workflows/yamllint-core.yml +++ b/.github/workflows/yamllint-core.yml @@ -9,12 +9,13 @@ on: - 'modules/*/config/locales/en.yml' - 'modules/*/config/locales/js-en.yml' -permissions: {} - jobs: - rubocop: + yamllint: name: yamllint runs-on: ubuntu-latest + permissions: + contents: read + checks: write steps: - name: Checkout code uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 From 5ea0c74f1deca064c182cc5bc5dcb4734454db03 Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Wed, 3 Jun 2026 21:09:02 +0200 Subject: [PATCH 4/7] cleanup options of all linters --- .github/workflows/erb-lint-core.yml | 2 -- .github/workflows/rubocop-core.yml | 3 +-- .github/workflows/yamllint-core.yml | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/erb-lint-core.yml b/.github/workflows/erb-lint-core.yml index e2fb8b58329..8a79ddac55c 100644 --- a/.github/workflows/erb-lint-core.yml +++ b/.github/workflows/erb-lint-core.yml @@ -26,6 +26,4 @@ jobs: - name: Run erb-lint uses: tk0miya/action-erblint@44c5fe3552356fe8bff23f30d534aa4258aa3f7b # v1 with: - github_token: ${{ secrets.github_token }} reporter: github-pr-check - fail_on_error: true diff --git a/.github/workflows/rubocop-core.yml b/.github/workflows/rubocop-core.yml index c43990206af..15aa735f6a4 100644 --- a/.github/workflows/rubocop-core.yml +++ b/.github/workflows/rubocop-core.yml @@ -22,7 +22,7 @@ jobs: - name: Run Rubocop uses: reviewdog/action-rubocop@b6d5e953a5fc0bf3ab65254e77730ea2174d6d6d # v2 with: - github_token: ${{ secrets.github_token }} + reporter: github-pr-check rubocop_version: gemfile rubocop_extensions: > rubocop-capybara:gemfile @@ -32,5 +32,4 @@ jobs: rubocop-rails:gemfile rubocop-rspec:gemfile rubocop-rspec_rails:gemfile - reporter: github-pr-check only_changed: true diff --git a/.github/workflows/yamllint-core.yml b/.github/workflows/yamllint-core.yml index cc3ba016993..04721f6765a 100644 --- a/.github/workflows/yamllint-core.yml +++ b/.github/workflows/yamllint-core.yml @@ -25,8 +25,7 @@ jobs: - name: Run Yamllint uses: reviewdog/action-yamllint@f01d8a48fd8d89f89895499fca2cff09f9e9e8c0 # v1.21.0 with: - github_token: ${{ secrets.github_token }} - fail_level: error + reporter: github-pr-check yamllint_flags: > .yamllint.yml config/locales/en.yml From c1c34cf8db3eb206961d25470296923153a731a7 Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Thu, 4 Jun 2026 16:07:35 +0200 Subject: [PATCH 5/7] use our fork of tk0miya/action-erblint --- .github/workflows/erb-lint-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/erb-lint-core.yml b/.github/workflows/erb-lint-core.yml index 8a79ddac55c..c80d19e1ee4 100644 --- a/.github/workflows/erb-lint-core.yml +++ b/.github/workflows/erb-lint-core.yml @@ -24,6 +24,6 @@ jobs: - name: Install erb_lint run: gem install -N erb_lint erblint-github - name: Run erb-lint - uses: tk0miya/action-erblint@44c5fe3552356fe8bff23f30d534aa4258aa3f7b # v1 + uses: opf/action-erblint@49c54b56c60d0c50885065468cf149b61d5c2a60 # main with: reporter: github-pr-check From 522c75e9b5ad2b4b281a93712c68d0a4378060ce Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Thu, 4 Jun 2026 16:22:16 +0200 Subject: [PATCH 6/7] rely on ruby/setup-ruby to install bundle for erb_lint action and use it --- .github/workflows/erb-lint-core.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/erb-lint-core.yml b/.github/workflows/erb-lint-core.yml index c80d19e1ee4..206b074fb07 100644 --- a/.github/workflows/erb-lint-core.yml +++ b/.github/workflows/erb-lint-core.yml @@ -21,9 +21,10 @@ jobs: persist-credentials: false - name: Set up Ruby uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1 - - name: Install erb_lint - run: gem install -N erb_lint erblint-github + with: + bundler-cache: true - name: Run erb-lint uses: opf/action-erblint@49c54b56c60d0c50885065468cf149b61d5c2a60 # main with: reporter: github-pr-check + use_bundler: true From 370ae1826232f6914a4a9a0f900ba216bacc0f2f Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Thu, 4 Jun 2026 20:35:56 +0200 Subject: [PATCH 7/7] name and newline consistency --- .github/workflows/erb-lint-core.yml | 2 +- .github/workflows/eslint-core.yml | 14 +++++++++----- .github/workflows/rubocop-core.yml | 6 +++--- .github/workflows/yamllint-core.yml | 5 ++--- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/erb-lint-core.yml b/.github/workflows/erb-lint-core.yml index 206b074fb07..bb1d76d1389 100644 --- a/.github/workflows/erb-lint-core.yml +++ b/.github/workflows/erb-lint-core.yml @@ -23,7 +23,7 @@ jobs: uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1 with: bundler-cache: true - - name: Run erb-lint + - name: Run ERB lint uses: opf/action-erblint@49c54b56c60d0c50885065468cf149b61d5c2a60 # main with: reporter: github-pr-check diff --git a/.github/workflows/eslint-core.yml b/.github/workflows/eslint-core.yml index 8219ad24b75..a159f046ca7 100644 --- a/.github/workflows/eslint-core.yml +++ b/.github/workflows/eslint-core.yml @@ -1,4 +1,5 @@ -name: eslint +name: ESLint + on: pull_request: branches: @@ -11,23 +12,26 @@ on: jobs: eslint: - name: eslint + name: ESLint runs-on: ubuntu-latest permissions: contents: read checks: write steps: - - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - name: Checkout code + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: fetch-depth: 0 persist-credentials: false - - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 + - name: Set up Node + uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6 with: node-version: '22.15' package-manager-cache: false cache: npm cache-dependency-path: frontend/package-lock.json - - uses: reviewdog/action-eslint@556a3fdaf8b4201d4d74d406013386aa4f7dab96 # v1 + - name: Run ESLint + uses: reviewdog/action-eslint@556a3fdaf8b4201d4d74d406013386aa4f7dab96 # v1 with: reporter: github-pr-check workdir: 'frontend/' diff --git a/.github/workflows/rubocop-core.yml b/.github/workflows/rubocop-core.yml index 15aa735f6a4..ce3e1573adc 100644 --- a/.github/workflows/rubocop-core.yml +++ b/.github/workflows/rubocop-core.yml @@ -1,4 +1,4 @@ -name: rubocop +name: RuboCop on: pull_request: @@ -7,7 +7,7 @@ on: jobs: rubocop: - name: rubocop + name: RuboCop runs-on: ubuntu-latest permissions: contents: read @@ -19,7 +19,7 @@ jobs: persist-credentials: false - name: Set up Ruby uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1 - - name: Run Rubocop + - name: Run RuboCop uses: reviewdog/action-rubocop@b6d5e953a5fc0bf3ab65254e77730ea2174d6d6d # v2 with: reporter: github-pr-check diff --git a/.github/workflows/yamllint-core.yml b/.github/workflows/yamllint-core.yml index 04721f6765a..47e3b757622 100644 --- a/.github/workflows/yamllint-core.yml +++ b/.github/workflows/yamllint-core.yml @@ -1,4 +1,4 @@ -name: yamllint +name: Yamllint on: pull_request: @@ -11,7 +11,7 @@ on: jobs: yamllint: - name: yamllint + name: Yamllint runs-on: ubuntu-latest permissions: contents: read @@ -21,7 +21,6 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false - - name: Run Yamllint uses: reviewdog/action-yamllint@f01d8a48fd8d89f89895499fca2cff09f9e9e8c0 # v1.21.0 with: