diff --git a/.github/workflows/dispatch-build-bottle.yml b/.github/workflows/dispatch-build-bottle.yml index 1b8953a0925..716bcb70170 100644 --- a/.github/workflows/dispatch-build-bottle.yml +++ b/.github/workflows/dispatch-build-bottle.yml @@ -132,19 +132,12 @@ jobs: if: always() && runner.os == 'Linux' run: docker cp ${{github.sha}}:/tmp/bottles . - - name: Failures summary for brew test-bot --only-formulae + - name: Failures Summary and Bottle Result if: always() - run: | - touch bottles/steps_output.txt - cat bottles/steps_output.txt - rm bottles/steps_output.txt - - - name: Output brew bottle result - if: always() - run: | - cat bottles/bottle_output.txt - rm bottles/bottle_output.txt - + uses: Homebrew/actions/failures-summary-and-bottle-result@master + with: + workdir: ${{matrix.workdir || github.workspace}} + - name: Upload logs if: always() uses: actions/upload-artifact@main diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3266344ee50..0ed5777c307 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -229,12 +229,11 @@ jobs: cd bottles brew test-bot ${{ needs.setup_tests.outputs.test-bot-formulae-args }} - - name: Failures summary for brew test-bot ${{ needs.setup_tests.outputs.test-bot-formulae-args }} + - name: Failures Summary and Bottle Result if: always() - run: | - touch bottles/steps_output.txt - cat bottles/steps_output.txt - rm bottles/steps_output.txt + uses: Homebrew/actions/failures-summary-and-bottle-result@master + with: + workdir: ${{matrix.workdir || github.workspace}} - name: Output brew linkage result if: always() @@ -242,12 +241,6 @@ jobs: cat bottles/linkage_output.txt rm bottles/linkage_output.txt - - name: Output brew bottle result - if: always() - run: | - cat bottles/bottle_output.txt - rm bottles/bottle_output.txt - - name: Run brew test-bot ${{ needs.setup_tests.outputs.test-bot-dependents-args }} --skipped-or-failed-formulae=${{ steps.brew-test-bot-formulae.outputs.skipped_or_failed_formulae }} if: ${{(success() || failure()) && fromJson(needs.setup_tests.outputs.test-dependents)}} run: |