diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index e2eb275645f..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: | @@ -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_* - name: Get hashes uses: actions/download-artifact@v4 with: 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