diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6bb96e54..8861ef274 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,15 @@ jobs: - name: Install nimble deps if: steps.cache-nimbledeps.outputs.cache-hit != 'true' run: | - nimble setup --localdeps + # Remove nim/nimble entries from lock to avoid cross-platform checksum mismatch + python3 -c " + import json, sys + lock = json.load(open('nimble.lock')) + for key in ['nim', 'nimble']: + lock['packages'].pop(key, None) + json.dump(lock, open('nimble.lock', 'w'), indent=2) + " + nimble setup --localdeps -y make rebuild-nat-libs-nimbledeps make rebuild-bearssl-nimbledeps touch nimbledeps/.nimble-setup @@ -133,7 +141,15 @@ jobs: - name: Install nimble deps if: steps.cache-nimbledeps.outputs.cache-hit != 'true' run: | - nimble setup --localdeps + # Remove nim/nimble entries from lock to avoid cross-platform checksum mismatch + python3 -c " + import json, sys + lock = json.load(open('nimble.lock')) + for key in ['nim', 'nimble']: + lock['packages'].pop(key, None) + json.dump(lock, open('nimble.lock', 'w'), indent=2) + " + nimble setup --localdeps -y make rebuild-nat-libs-nimbledeps make rebuild-bearssl-nimbledeps touch nimbledeps/.nimble-setup @@ -208,7 +224,15 @@ jobs: - name: Install nimble deps if: steps.cache-nimbledeps.outputs.cache-hit != 'true' run: | - nimble setup --localdeps + # Remove nim/nimble entries from lock to avoid cross-platform checksum mismatch + python3 -c " + import json, sys + lock = json.load(open('nimble.lock')) + for key in ['nim', 'nimble']: + lock['packages'].pop(key, None) + json.dump(lock, open('nimble.lock', 'w'), indent=2) + " + nimble setup --localdeps -y make rebuild-nat-libs-nimbledeps make rebuild-bearssl-nimbledeps touch nimbledeps/.nimble-setup diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml index 3d29e998a..e33f2ec60 100644 --- a/.github/workflows/container-image.yml +++ b/.github/workflows/container-image.yml @@ -70,7 +70,15 @@ jobs: - name: Install nimble deps if: ${{ steps.secrets.outcome == 'success' && steps.cache-nimbledeps.outputs.cache-hit != 'true' }} run: | - nimble setup --localdeps + # Remove nim/nimble entries from lock to avoid cross-platform checksum mismatch + python3 -c " + import json, sys + lock = json.load(open('nimble.lock')) + for key in ['nim', 'nimble']: + lock['packages'].pop(key, None) + json.dump(lock, open('nimble.lock', 'w'), indent=2) + " + nimble setup --localdeps -y make rebuild-nat-libs-nimbledeps make rebuild-bearssl-nimbledeps touch nimbledeps/.nimble-setup