Skip to content

Commit 734ebdc

Browse files
authored
Merge branch 'main' into bench_vs_p3
2 parents 3010b38 + c66f029 commit 734ebdc

1 file changed

Lines changed: 41 additions & 1 deletion

File tree

.github/workflows/pr_main.yaml

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
path: |
7474
executor/program_artifacts/rust
7575
executor/shared_target
76-
key: rust-elf-artifacts-${{ hashFiles('executor/programs/rust/**', 'executor/programs/riscv64im-lambda-vm-elf.json', 'syscalls/**') }}
76+
key: rust-elf-artifacts-${{ hashFiles('executor/programs/rust/**', 'executor/programs/riscv64im-lambda-vm-elf.json', 'syscalls/**', 'Makefile') }}
7777
restore-keys: |
7878
rust-elf-artifacts-
7979
@@ -187,6 +187,26 @@ jobs:
187187
run: |
188188
make compile-programs-asm
189189
190+
- name: Cache compiled Rust ELF artifacts and build cache
191+
id: cache-rust-elfs
192+
uses: actions/cache@v4
193+
with:
194+
path: |
195+
executor/program_artifacts/rust
196+
executor/shared_target
197+
key: rust-elf-artifacts-${{ hashFiles('executor/programs/rust/**', 'executor/programs/riscv64im-lambda-vm-elf.json', 'syscalls/**', 'Makefile') }}
198+
restore-keys: |
199+
rust-elf-artifacts-
200+
201+
- name: Setup Rust Environment
202+
if: steps.cache-rust-elfs.outputs.cache-hit != 'true'
203+
uses: ./.github/actions/setup-rust
204+
205+
- name: Compile Rust programs to ELF
206+
if: steps.cache-rust-elfs.outputs.cache-hit != 'true'
207+
run: |
208+
make compile-programs-rust
209+
190210
- name: Install nextest
191211
uses: taiki-e/install-action@v2
192212
with:
@@ -229,6 +249,26 @@ jobs:
229249
run: |
230250
make compile-programs-asm
231251
252+
- name: Cache compiled Rust ELF artifacts and build cache
253+
id: cache-rust-elfs
254+
uses: actions/cache@v4
255+
with:
256+
path: |
257+
executor/program_artifacts/rust
258+
executor/shared_target
259+
key: rust-elf-artifacts-${{ hashFiles('executor/programs/rust/**', 'executor/programs/riscv64im-lambda-vm-elf.json', 'syscalls/**', 'Makefile') }}
260+
restore-keys: |
261+
rust-elf-artifacts-
262+
263+
- name: Setup Rust Environment
264+
if: steps.cache-rust-elfs.outputs.cache-hit != 'true'
265+
uses: ./.github/actions/setup-rust
266+
267+
- name: Compile Rust programs to ELF
268+
if: steps.cache-rust-elfs.outputs.cache-hit != 'true'
269+
run: |
270+
make compile-programs-rust
271+
232272
- name: Install nextest
233273
uses: taiki-e/install-action@v2
234274
with:

0 commit comments

Comments
 (0)