diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-07 10:50:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-07 10:50:52 +0100 |
| commit | 0194bd33fe4294ef6c1af34e907360f2980155c8 (patch) | |
| tree | 39b966d8c051d08eff2ddf203051dc91ad15e01a /.github/workflows | |
| parent | fe523a304520a09f6371f45bd63b9e8988776c03 (diff) | |
| parent | 16fb604c52a84a48bb729ea15e7fa8c9568ae118 (diff) | |
Merge pull request #1995 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 |