Skip to content

Commit b91624d

Browse files
committed
fix CI failure
1 parent efce14d commit b91624d

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

.github/workflows/rust.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jobs:
4747
- cairo_bench_programs
4848
- cairo_proof_programs
4949
- cairo_test_programs
50-
- cairo_test_suite_programs
5150
- cairo_1_test_contracts
5251
- cairo_2_test_contracts
5352
name: Build Cairo programs
@@ -88,8 +87,7 @@ jobs:
8887
&& matrix.program-target != 'cairo_2_test_contracts'
8988
run: |
9089
make python-deps
91-
. cairo-vm-env/bin/activate
92-
echo PATH=$PATH >> $GITHUB_ENV
90+
echo "$(pwd)/cairo-vm-env/bin" >> $GITHUB_PATH
9391
9492
- name: Install cairo 1 compiler
9593
if: steps.cache-programs.outputs.cache-hit != 'true' && matrix.program-target == 'cairo_1_test_contracts'
@@ -101,7 +99,9 @@ jobs:
10199

102100
- name: Build programs
103101
if: steps.cache-programs.outputs.cache-hit != 'true'
104-
run: make -j ${{ matrix.program-target }}
102+
run: |
103+
[ -d cairo-vm-env ] && . cairo-vm-env/bin/activate || true
104+
make -j ${{ matrix.program-target }}
105105
106106
# NOTE: used to reduce the amount of cache steps we need in later jobs
107107
# TODO: remove this cache once the workflow finishes
@@ -136,12 +136,6 @@ jobs:
136136
path: ${{ env.CAIRO_PROGRAMS_PATH }}
137137
key: cairo_bench_programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'vm/src/tests/cairo_test_suite/**/*.cairo', 'Makefile', 'requirements.txt') }}
138138
fail-on-cache-miss: true
139-
- name: Fetch cairo test suite programs
140-
uses: actions/cache/restore@v3
141-
with:
142-
path: ${{ env.CAIRO_PROGRAMS_PATH }}
143-
key: cairo_test_suite_programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'vm/src/tests/cairo_test_suite/**/*.cairo', 'Makefile', 'requirements.txt') }}
144-
fail-on-cache-miss: true
145139
- name: Fetch test contracts (Cairo 1)
146140
uses: actions/cache/restore@v3
147141
with:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ check:
277277

278278
cairo_test_suite_programs: $(COMPILED_CAIRO_TEST_SUITE)
279279

280-
cairo_test_programs: $(COMPILED_TESTS) $(COMPILED_BAD_TESTS) $(COMPILED_NORETROCOMPAT_TESTS) $(COMPILED_PRINT_TESTS) $(COMPILED_MOD_BUILTIN_TESTS) $(COMPILED_SECP_CAIRO0_HINTS) $(COMPILED_KZG_DA_CAIRO0_HINTS) $(COMPILED_SEGMENT_ARENA_CAIRO0_HINTS)
280+
cairo_test_programs: $(COMPILED_TESTS) $(COMPILED_BAD_TESTS) $(COMPILED_NORETROCOMPAT_TESTS) $(COMPILED_PRINT_TESTS) $(COMPILED_MOD_BUILTIN_TESTS) $(COMPILED_SECP_CAIRO0_HINTS) $(COMPILED_KZG_DA_CAIRO0_HINTS) $(COMPILED_SEGMENT_ARENA_CAIRO0_HINTS) $(COMPILED_CAIRO_TEST_SUITE)
281281
cairo_proof_programs: $(COMPILED_PROOF_TESTS) $(COMPILED_MOD_BUILTIN_PROOF_TESTS) $(COMPILED_STWO_EXCLUSIVE_TESTS)
282282
cairo_bench_programs: $(COMPILED_BENCHES)
283283
cairo_1_test_contracts: $(CAIRO_1_COMPILED_CASM_CONTRACTS)

0 commit comments

Comments
 (0)