Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: The reproducible workflow is no longer messed up because of breaking changes in the upload-artifacts step #4575

Merged
merged 6 commits into from
Feb 29, 2024
Merged

fix: The reproducible workflow is no longer messed up because of breaking changes in the upload-artifacts step #4575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3173a10
++
bitdivine Feb 28, 2024
a43dc24
Disable mac builds
bitdivine Feb 29, 2024
5d170dc
Trigger on pushing this branch
bitdivine Feb 29, 2024
74a9c2e
No longer trigger workflow on this branch
bitdivine Feb 29, 2024
79fcbe3
Merge remote-tracking branch 'origin/main' into merge-docker-build-ar…
bitdivine Feb 29, 2024
8b0b183
changelog
bitdivine Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/reproducible.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
os:
# - macos-11
# - macos-12
- ubuntu-20.04
- ubuntu-22.04
bitdivine marked this conversation as resolved.
Show resolved Hide resolved
steps:
- name: Unbork mac
run: |
Expand Down Expand Up @@ -69,12 +73,17 @@ jobs:
- name: 'Upload hashes'
uses: actions/upload-artifact@v4
with:
name: hashes
name: hashes_${{ matrix.os }}_${{ matrix.time }}
path: hashes/*.txt
compare_hashes:
runs-on: ubuntu-latest
needs: [docker_build]
steps:
- name: Merge Hashes
uses: actions/upload-artifact/merge@v4
with:
name: hashes
pattern: hashes_*
bitdivine marked this conversation as resolved.
Show resolved Hide resolved
- name: Get hashes
uses: actions/download-artifact@v4
with:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG-Nns-Dapp-unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,6 @@ proposal is successful, the changes it released will be moved from this file to
#### Fixed

* Adapted Dockerfile to the new `dfx` installation procedure.
* Adapted the docker reproducibility test to work with `upload-artifact@v4`.

#### Security
Loading