Skip to content

Commit 037b328

Browse files
JulianGCalderonJulianGCalderon
committed
Add Makefile and requirements.txt to cache key
1 parent 0038711 commit 037b328

File tree

2 files changed

+19
-21
lines changed

2 files changed

+19
-21
lines changed

‎.github/workflows/rust.yml‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ jobs:
6666
id: cache-programs
6767
with:
6868
path: ${{ env.CAIRO_PROGRAMS_PATH }}
69-
key: ${{ matrix.program-target }}-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
70-
restore-keys: ${{ matrix.program-target }}-cache-
69+
key: ${{ matrix.program-target }}-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
7170

7271
# This is not pretty, but we need `make` to see the compiled programs are
7372
# actually newer than the sources, otherwise it will try to rebuild them
@@ -121,44 +120,44 @@ jobs:
121120
uses: actions/cache/restore@v3
122121
with:
123122
path: ${{ env.CAIRO_PROGRAMS_PATH }}
124-
key: cairo_test_programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
123+
key: cairo_test_programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
125124
fail-on-cache-miss: true
126125
- name: Fetch cairo stwo exclusive programs
127126
uses: actions/cache/restore@v3
128127
with:
129128
path: ${{ env.CAIRO_PROGRAMS_PATH }}
130-
key: cairo_stwo_exclusive_programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
129+
key: cairo_stwo_exclusive_programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
131130
fail-on-cache-miss: true
132131
- name: Fetch proof programs
133132
uses: actions/cache/restore@v3
134133
with:
135134
path: ${{ env.CAIRO_PROGRAMS_PATH }}
136-
key: cairo_proof_programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
135+
key: cairo_proof_programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
137136
fail-on-cache-miss: true
138137
- name: Fetch bench programs
139138
uses: actions/cache/restore@v3
140139
with:
141140
path: ${{ env.CAIRO_PROGRAMS_PATH }}
142-
key: cairo_bench_programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
141+
key: cairo_bench_programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
143142
fail-on-cache-miss: true
144143
- name: Fetch test contracts (Cairo 1)
145144
uses: actions/cache/restore@v3
146145
with:
147146
path: ${{ env.CAIRO_PROGRAMS_PATH }}
148-
key: cairo_1_test_contracts-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
147+
key: cairo_1_test_contracts-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
149148
fail-on-cache-miss: true
150149
- name: Fetch test contracts (Cairo 2)
151150
uses: actions/cache/restore@v3
152151
with:
153152
path: ${{ env.CAIRO_PROGRAMS_PATH }}
154-
key: cairo_2_test_contracts-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
153+
key: cairo_2_test_contracts-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
155154
fail-on-cache-miss: true
156155

157156
- name: Merge caches
158157
uses: actions/cache/save@v3
159158
with:
160159
path: ${{ env.CAIRO_PROGRAMS_PATH }}
161-
key: all-programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
160+
key: all-programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
162161

163162
lint:
164163
needs: merge-caches
@@ -187,7 +186,7 @@ jobs:
187186
uses: actions/cache/restore@v3
188187
with:
189188
path: ${{ env.CAIRO_PROGRAMS_PATH }}
190-
key: all-programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
189+
key: all-programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
191190
fail-on-cache-miss: true
192191

193192
- name: Run clippy
@@ -232,7 +231,7 @@ jobs:
232231
uses: actions/cache/restore@v3
233232
with:
234233
path: ${{ env.CAIRO_PROGRAMS_PATH }}
235-
key: all-programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
234+
key: all-programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
236235
fail-on-cache-miss: true
237236

238237
# NOTE: we do this separately because --workspace operates in weird ways
@@ -279,7 +278,7 @@ jobs:
279278
uses: actions/cache/restore@v3
280279
with:
281280
path: ${{ env.CAIRO_PROGRAMS_PATH }}
282-
key: all-programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
281+
key: all-programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
283282
fail-on-cache-miss: true
284283

285284
- name: Check all features (workspace)
@@ -314,7 +313,7 @@ jobs:
314313
uses: actions/cache/restore@v3
315314
with:
316315
path: ${{ env.CAIRO_PROGRAMS_PATH }}
317-
key: all-programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
316+
key: all-programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
318317
fail-on-cache-miss: true
319318

320319
- name: Check no-std
@@ -351,7 +350,7 @@ jobs:
351350
uses: actions/cache/restore@v3
352351
with:
353352
path: ${{ env.CAIRO_PROGRAMS_PATH }}
354-
key: all-programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
353+
key: all-programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
355354
fail-on-cache-miss: true
356355

357356
- name: Install testing tools
@@ -448,8 +447,7 @@ jobs:
448447
cairo_programs/**/*.air_public_input
449448
cairo_programs/**/*.air_private_input
450449
cairo_programs/**/*.pie.zip
451-
key: ${{ matrix.program-target }}-reference-trace-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
452-
restore-keys: ${{ matrix.program-target }}-reference-trace-cache-
450+
key: ${{ matrix.program-target }}-reference-trace-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
453451

454452
- name: Python3 Build
455453
if: steps.trace-cache.outputs.cache-hit != 'true'
@@ -467,7 +465,7 @@ jobs:
467465
uses: actions/cache/restore@v3
468466
with:
469467
path: ${{ env.CAIRO_PROGRAMS_PATH }}
470-
key: ${{ matrix.program-target }}-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
468+
key: ${{ matrix.program-target }}-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
471469
fail-on-cache-miss: true
472470

473471
# This is not pretty, but we need `make` to see the compiled programs are
@@ -520,7 +518,7 @@ jobs:
520518
uses: actions/cache/restore@v3
521519
with:
522520
path: ${{ env.CAIRO_PROGRAMS_PATH }}
523-
key: ${{ matrix.program-target }}-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
521+
key: ${{ matrix.program-target }}-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
524522
fail-on-cache-miss: true
525523

526524
- name: Generate traces
@@ -675,7 +673,7 @@ jobs:
675673
cairo_programs/**/*.air_public_input
676674
cairo_programs/**/*.air_private_input
677675
cairo_programs/**/*.pie.zip
678-
key: ${{ matrix.program-target }}-reference-trace-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
676+
key: ${{ matrix.program-target }}-reference-trace-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
679677
fail-on-cache-miss: true
680678

681679
- name: Fetch traces for cairo-vm
@@ -760,7 +758,7 @@ jobs:
760758
uses: actions/cache/restore@v3
761759
with:
762760
path: ${{ env.CAIRO_PROGRAMS_PATH }}
763-
key: cairo_proof_programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
761+
key: cairo_proof_programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
764762
fail-on-cache-miss: true
765763

766764
- name: Run script
@@ -799,7 +797,7 @@ jobs:
799797
uses: actions/cache/restore@v3
800798
with:
801799
path: ${{ env.CAIRO_PROGRAMS_PATH }}
802-
key: cairo_proof_programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
800+
key: cairo_proof_programs-cache-${{ hashFiles('**/*.cairo', 'Makefile', 'requirements.txt') }}
803801
fail-on-cache-miss: true
804802

805803
- name: Fetch pie

‎empty‎

Whitespace-only changes.

0 commit comments

Comments
 (0)