diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-07 09:03:42 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-12-07 09:03:42 +0100 |
| commit | 9a3d91f629ae0e8f722d56b8634bfad299ab9f04 (patch) | |
| tree | 324a2b04d34049d7f31a041d6a44b23d45a46e6b /.github/workflows | |
| parent | fe523a304520a09f6371f45bd63b9e8988776c03 (diff) | |
| parent | b59fb28e90bc21d6fd1a6bafd13cfbd81ab5be54 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/check-i18n.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linter.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml index a9d8ea2ea..9a7463060 100644 --- a/.github/workflows/check-i18n.yml +++ b/.github/workflows/check-i18n.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.0' + ruby-version: .ruby-version bundler-cache: true - name: Check locale file normalization run: bundle exec i18n-tasks check-normalized diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 874afc459..319152e93 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -53,7 +53,7 @@ jobs: - name: Set-up Node.js uses: actions/setup-node@v3 with: - node-version: 16.x + node-version-file: .nvmrc cache: yarn - name: Install dependencies run: yarn install --frozen-lockfile |