Fix Nim binaries cache key of main CI

Why:
Multiple CI share the same cache key will fail to save the cached files.

Also:
Fix simulators CI path to cached llvm-mingw on windows.
This commit is contained in:
jangko 2023-09-14 10:23:15 +07:00
parent 73622459b1
commit dbb17ab68c
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
2 changed files with 7 additions and 2 deletions

View File

@ -221,7 +221,7 @@ jobs:
runner.os == 'Windows'
run: |
echo '${{ github.workspace }}'"/external/mingw-${{ matrix.target.cpu }}/bin" >> $GITHUB_PATH
echo '${{ github.workspace }}'"/external/dlls-${{ matrix.target.cpu }}" >> $GITHUB_PATH
echo '${{ github.workspace }}'"/external/dlls-${{ matrix.target.cpu }}" >> $GITHUB_PATH
- name: Get latest nimbus-build-system commit hash
id: versions
@ -237,7 +237,7 @@ jobs:
uses: actions/cache@v3
with:
path: NimBinCache
key: 'nim-${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.nimbus_build_system }}'
key: 'nim-${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.nimbus_build_system }}-${{ matrix.target.evmc }}'
- name: Build Nim and Nimbus-eth1 dependencies
run: |

View File

@ -119,6 +119,11 @@ jobs:
curl -L "$MINGW_URL" -o "external/mingw-amd64.zip"
7z x -y "external/mingw-amd64.zip" -oexternal/mingw-amd64/
mv external/mingw-amd64/**/* ./external/mingw-amd64
- name: Path to cached dependencies (Windows)
if: >
runner.os == 'Windows'
run: |
echo '${{ github.workspace }}'"/external/mingw-amd64/bin" >> $GITHUB_PATH
- name: Get latest nimbus-build-system commit hash