cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/3505'

Browse source
This commit is contained in:
Tom Hughes 2022-03-21 23:56:41 +00:00
commit 7364f40fca
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/lint.yml vendored
View file

@ -17,7 +17,7 @@ jobs:
with: with:
ruby-version: ${{ env.ruby }} ruby-version: ${{ env.ruby }}
- name: Cache gems - name: Cache gems
uses: actions/cache@v2.1.7 uses: actions/cache@v3
with: with:
path: vendor/bundle path: vendor/bundle
key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
@ -41,7 +41,7 @@ jobs:
with: with:
ruby-version: ${{ env.ruby }} ruby-version: ${{ env.ruby }}
- name: Cache gems - name: Cache gems
uses: actions/cache@v2.1.7 uses: actions/cache@v3
with: with:
path: vendor/bundle path: vendor/bundle
key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
@ -65,14 +65,14 @@ jobs:
with: with:
ruby-version: ${{ env.ruby }} ruby-version: ${{ env.ruby }}
- name: Cache gems - name: Cache gems
uses: actions/cache@v2.1.7 uses: actions/cache@v3
with: with:
path: vendor/bundle path: vendor/bundle
key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}
restore-keys: | restore-keys: |
bundle-${{ env.os }}-${{ env.ruby }}- bundle-${{ env.os }}-${{ env.ruby }}-
- name: Cache node modules - name: Cache node modules
uses: actions/cache@v2.1.7 uses: actions/cache@v3
with: with:
path: node_modules path: node_modules
key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }} key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }}
@ -100,7 +100,7 @@ jobs:
with: with:
ruby-version: ${{ env.ruby }} ruby-version: ${{ env.ruby }}
- name: Cache gems - name: Cache gems
uses: actions/cache@v2.1.7 uses: actions/cache@v3
with: with:
path: vendor/bundle path: vendor/bundle
key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }}

4
.github/workflows/tests.yml vendored
View file

@ -21,14 +21,14 @@ jobs:
with: with:
ruby-version: ${{ matrix.ruby }} ruby-version: ${{ matrix.ruby }}
- name: Cache gems - name: Cache gems
uses: actions/cache@v2.1.7 uses: actions/cache@v3
with: with:
path: vendor/bundle path: vendor/bundle
key: bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }} key: bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }}
restore-keys: | restore-keys: |
bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}- bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-
- name: Cache node modules - name: Cache node modules
uses: actions/cache@v2.1.7 uses: actions/cache@v3
with: with:
path: node_modules path: node_modules
key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }} key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }}