From fc3e15ce40a97a62152dfb541ca893a106be76f7 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 25 Jun 2021 14:31:03 +0100 Subject: [PATCH] Workflows tweaks - use new `GITHUB_ACTIONS_HOMEBREW_MACOS_SELF_HOSTED` variable - add some comments to explain Linux code --- .github/workflows/dispatch-build-bottle.yml | 2 +- .github/workflows/dispatch-rebottle.yml | 2 +- .github/workflows/tests.yml | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dispatch-build-bottle.yml b/.github/workflows/dispatch-build-bottle.yml index 4ebf89eec65..441436c14b4 100644 --- a/.github/workflows/dispatch-build-bottle.yml +++ b/.github/workflows/dispatch-build-bottle.yml @@ -29,7 +29,7 @@ jobs: timeout-minutes: 4320 env: PATH: "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" - GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED: 1 + GITHUB_ACTIONS_HOMEBREW_MACOS_SELF_HOSTED: 1 GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} steps: - name: ${{github.event.inputs.formula}} diff --git a/.github/workflows/dispatch-rebottle.yml b/.github/workflows/dispatch-rebottle.yml index 2add567db20..a29ca249a3b 100644 --- a/.github/workflows/dispatch-rebottle.yml +++ b/.github/workflows/dispatch-rebottle.yml @@ -30,7 +30,7 @@ jobs: timeout-minutes: 4320 env: PATH: "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" - GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED: 1 + GITHUB_ACTIONS_HOMEBREW_MACOS_SELF_HOSTED: 1 GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1 steps: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3fc53b4a1d5..99a58aa93fd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -130,8 +130,9 @@ jobs: run: | if [ "$RUNNER_OS" = 'macOS' ]; then echo 'PATH=/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin' >> $GITHUB_ENV - echo 'GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED=1' >> $GITHUB_ENV + echo 'GITHUB_ACTIONS_HOMEBREW_MACOS_SELF_HOSTED=1' >> $GITHUB_ENV else + # No PATH needed on Linux as set by Docker echo 'HOMEBREW_CORE_GIT_REMOTE=${{github.event.repository.html_url}}' >> $GITHUB_ENV echo 'HOMEBREW_FORCE_HOMEBREW_ON_LINUX=1' >> $GITHUB_ENV fi @@ -152,6 +153,8 @@ jobs: - if: runner.os == 'macOS' run: brew test-bot --only-cleanup-before + # `brew doctor` won't work on Linux (yet) + # TODO: reenable this when possible. - if: runner.os == 'macOS' run: brew test-bot --only-setup