Skip to content

Commit 4baf430

Browse files
committed
ci: library cache should be keyed on patches
1 parent 9e6e6ac commit 4baf430

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
if: matrix.sys == 'disable'
8989
with:
9090
path: ports
91-
key: ports-ubuntu-${{hashFiles('**/dependencies.yml')}}
91+
key: ports-ubuntu-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
9292
- run: bundle install --local || bundle install
9393
- run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
9494
- run: bundle exec rake test
@@ -111,7 +111,7 @@ jobs:
111111
if: matrix.sys == 'disable'
112112
with:
113113
path: ports
114-
key: ports-ubuntu-${{hashFiles('**/dependencies.yml')}}
114+
key: ports-ubuntu-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
115115
- run: bundle install --local || bundle install
116116
- run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
117117
- run: bundle exec rake test:valgrind
@@ -172,7 +172,7 @@ jobs:
172172
if: matrix.sys == 'disable'
173173
with:
174174
path: ports
175-
key: ports-ubuntu-${{hashFiles('**/dependencies.yml')}}
175+
key: ports-ubuntu-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
176176
- run: bundle install --local || bundle install
177177
- run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
178178
- run: bundle exec rake test
@@ -197,7 +197,7 @@ jobs:
197197
if: matrix.sys == 'disable'
198198
with:
199199
path: ports
200-
key: ports-ubuntu-${{hashFiles('**/dependencies.yml')}}
200+
key: ports-ubuntu-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
201201
- run: bundle install --local || bundle install
202202
- run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
203203
- run: bundle exec rake test:valgrind
@@ -222,7 +222,7 @@ jobs:
222222
if: matrix.sys == 'disable'
223223
with:
224224
path: ports
225-
key: ports-macos-${{hashFiles('**/dependencies.yml')}}
225+
key: ports-macos-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
226226
- run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
227227
- run: bundle exec rake test
228228

@@ -251,7 +251,7 @@ jobs:
251251
if: matrix.sys == 'disable'
252252
with:
253253
path: ports
254-
key: ports-windows-${{hashFiles('**/dependencies.yml')}}
254+
key: ports-windows-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
255255
- run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
256256
- run: bundle exec rake test
257257

.github/workflows/gem-install.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/cache@v2
2929
with:
3030
path: ports/archives
31-
key: tarballs-ubuntu-${{hashFiles('**/dependencies.yml')}}
31+
key: tarballs-ubuntu-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
3232
- run: ./scripts/test-gem-build gems ruby
3333
- uses: actions/upload-artifact@v2
3434
with:
@@ -119,7 +119,7 @@ jobs:
119119
- uses: actions/cache@v2
120120
with:
121121
path: ports/archives
122-
key: tarballs-ubuntu-${{hashFiles('**/dependencies.yml')}}
122+
key: tarballs-ubuntu-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
123123
- run: "./scripts/test-gem-build gems ${{matrix.plat}}"
124124
- uses: actions/upload-artifact@v2
125125
with:

.github/workflows/truffle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/cache@v2
2828
with:
2929
path: ports/archives
30-
key: tarballs-ubuntu-${{hashFiles('**/dependencies.yml')}}
30+
key: tarballs-ubuntu-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
3131
- run: bundle install --local || bundle install
3232
- run: bundle exec rake compile -- ${{matrix.flags}}
3333
- run: bundle exec rake test

.github/workflows/upstream.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
if: matrix.sys == 'disable'
9595
with:
9696
path: ports
97-
key: ports-${{matrix.plat}}-${{hashFiles('**/dependencies.yml')}}
97+
key: ports-${{matrix.plat}}-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
9898
- run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
9999
- run: bundle exec rake test
100100

@@ -118,7 +118,7 @@ jobs:
118118
if: matrix.sys == 'disable'
119119
with:
120120
path: ports
121-
key: ports-ubuntu-${{hashFiles('**/dependencies.yml')}}
121+
key: ports-ubuntu-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
122122
- run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
123123
- run: bundle exec rake test:valgrind
124124

@@ -146,7 +146,7 @@ jobs:
146146
- uses: actions/cache@v2
147147
with:
148148
path: ports
149-
key: ports-ubuntu-${{hashFiles('**/dependencies.yml')}}
149+
key: ports-ubuntu-${{hashFiles('dependencies.yml', 'patches/**/*.patch')}}
150150
- name: Update html5lib-tests
151151
run: |
152152
cd test/html5lib-tests

0 commit comments

Comments
 (0)