diff --git a/.github/workflows/reproducible.yaml b/.github/workflows/reproducible.yaml index e2eb275645f..fbcbb093848 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 + - fix-upload-artifacts-in-docker-repro tags: # The tag used when preparing a release. - release-candidate @@ -24,7 +25,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12] + os: + # - macos-14 - rus on mac silicon & doesn't support docker properly. + - ubuntu-20.04 + - ubuntu-22.04 + - macos-11 + - macos-12 + - macos-13 steps: - name: Unbork mac run: | @@ -34,8 +41,16 @@ jobs: echo "/usr/local/bin" >> $GITHUB_PATH echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH fi - - uses: docker-practice/actions-setup-docker@master - timeout-minutes: 12 + - uses: bitdivine/actions-setup-docker@master + #- uses: better0fdead/actions-setup-docker@better0fdead/increase-timeout + # Note: The above is a fork of: + # - uses: docker-practice/actions-setup-docker@master + # to be used until this PR is merged: + # https://github.com/docker-practice/actions-setup-docker/pull/29 + with: + docker_version: "24.0" + docker_channel: "stable" + timeout-minutes: 20 - name: Checkout uses: actions/checkout@v4 # Helps with debugging @@ -69,12 +84,18 @@ 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] + if: ${{ always() }} steps: + - name: Merge Hashes + uses: actions/upload-artifact/merge@v4 + with: + name: hashes + pattern: hashes_* - name: Get hashes uses: actions/download-artifact@v4 with: