From 3173a101f934cced99db07d1fd5074bbd54ff53e Mon Sep 17 00:00:00 2001 From: Max Murphy Date: Wed, 28 Feb 2024 16:22:39 +0100 Subject: [PATCH 1/5] ++ --- .github/workflows/reproducible.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index e2eb275645f..8edfbbb9226 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -69,12 +69,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_* - name: Get hashes uses: actions/download-artifact@v4 with: From a43dc24ed32b7c8d6ab11d64ef583bed1c0f60d6 Mon Sep 17 00:00:00 2001 From: Max Murphy Date: Thu, 29 Feb 2024 11:57:11 +0100 Subject: [PATCH 2/5] Disable mac builds --- .github/workflows/reproducible.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index 8edfbbb9226..45585a0f6bb 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -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 steps: - name: Unbork mac run: | From 5d170dc009bfe263449e8358651130a5267f5e23 Mon Sep 17 00:00:00 2001 From: Max Murphy Date: Thu, 29 Feb 2024 12:01:17 +0100 Subject: [PATCH 3/5] Trigger on pushing this branch --- .github/workflows/reproducible.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index 45585a0f6bb..81dd28f3265 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -10,6 +10,7 @@ on: branches: # This is the recommended development branch for this workflow; pushing it will trigger a build. - reproducible + - merge-docker-build-artifacts tags: # The tag used when preparing a release. - release-candidate From 74a9c2eb53277ea104d5abf24ed6bc5a57fa927a Mon Sep 17 00:00:00 2001 From: Max Murphy Date: Thu, 29 Feb 2024 16:11:43 +0100 Subject: [PATCH 4/5] No longer trigger workflow on this branch --- .github/workflows/reproducible.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index 81dd28f3265..45585a0f6bb 100644 --- a/.github/workflows/reproducible.yaml +++ b/.github/workflows/reproducible.yaml @@ -10,7 +10,6 @@ on: branches: # This is the recommended development branch for this workflow; pushing it will trigger a build. - reproducible - - merge-docker-build-artifacts tags: # The tag used when preparing a release. - release-candidate From 8b0b1837297c98df0e600df6779a479822359f44 Mon Sep 17 00:00:00 2001 From: Max Murphy Date: Thu, 29 Feb 2024 16:40:37 +0100 Subject: [PATCH 5/5] changelog --- CHANGELOG-Nns-Dapp-unreleased.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-Nns-Dapp-unreleased.md b/CHANGELOG-Nns-Dapp-unreleased.md index d7b0a6d2150..bdd50c82505 100644 --- a/CHANGELOG-Nns-Dapp-unreleased.md +++ b/CHANGELOG-Nns-Dapp-unreleased.md @@ -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