mirror of
https://github.com/JakeHillion/scx.git
synced 2024-11-30 04:50:24 +00:00
Merge pull request #520 from hodgesds/merge-fixes
ci: Fix cache directory
This commit is contained in:
commit
9f2d548b8f
10
.github/workflows/merge.yml
vendored
10
.github/workflows/merge.yml
vendored
@ -13,7 +13,7 @@ jobs:
|
||||
id: cache-veristat-restore
|
||||
uses: actions/cache/restore@v4
|
||||
with:
|
||||
path: ~/veristat
|
||||
path: ${{ github.workspace }}/veristat
|
||||
key: veristat-diffs-main
|
||||
|
||||
# Hard turn-off interactive mode
|
||||
@ -66,7 +66,7 @@ jobs:
|
||||
### END DEPENDENCIES ###
|
||||
|
||||
# The actual build:
|
||||
- run: meson setup build -Dkernel=$(pwd)/linux -Dkernel_headers=./linux/usr/include -Dveristat_diff_dir=~/veristat
|
||||
- run: meson setup build -Dkernel=$(pwd)/linux -Dkernel_headers=./linux/usr/include -Dveristat_diff_dir=$GITHUB_WORKSPACE/veristat
|
||||
- run: meson compile -C build --jobs=1
|
||||
|
||||
# Print CPU model before running the tests (this can be useful for
|
||||
@ -83,11 +83,11 @@ jobs:
|
||||
- run: meson compile -C build veristat_diff
|
||||
|
||||
# update veristat cache dirs
|
||||
- run: cd ~/veristat && for file in *_new.csv; do mv "$file" "${file%_new.csv}.csv"; done
|
||||
- run: cd $GITHUB_WORKSPACE/veristat && for file in *_new.csv; do mv "$file" "${file%_new.csv}.csv"; done || echo "failed to update veristat cache"
|
||||
|
||||
- name: Save veristat cache
|
||||
id: cache-veristat-save
|
||||
uses: actions/cache/save@v4
|
||||
with:
|
||||
path: ~/veristat
|
||||
key: ${{ steps.cache-primes-restore.outputs.cache-primary-key }}
|
||||
path: ${{ github.workspace }}/veristat
|
||||
key: veristat-diffs-main
|
||||
|
4
.github/workflows/pr_veristat.yml
vendored
4
.github/workflows/pr_veristat.yml
vendored
@ -9,7 +9,7 @@ jobs:
|
||||
id: cache-veristat-restore
|
||||
uses: actions/cache/restore@v4
|
||||
with:
|
||||
path: ~/veristat
|
||||
path: ${{ github.workspace }}/veristat
|
||||
key: veristat-diffs-main
|
||||
|
||||
# Hard turn-off interactive mode
|
||||
@ -62,7 +62,7 @@ jobs:
|
||||
### END DEPENDENCIES ###
|
||||
|
||||
# The actual build:
|
||||
- run: meson setup build -Dkernel=$(pwd)/linux -Dkernel_headers=./linux/usr/include -Dveristat_diff_dir=~/veristat
|
||||
- run: meson setup build -Dkernel=$(pwd)/linux -Dkernel_headers=./linux/usr/include -Dveristat_diff_dir=$GITHUB_WORKSPACE/veristat
|
||||
- run: meson compile -C build --jobs=1
|
||||
|
||||
# Print CPU model before running the tests (this can be useful for
|
||||
|
Loading…
Reference in New Issue
Block a user