Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workflows/tests: use testing formulae from determine-test-runners (again) #183917

Merged
merged 2 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/scripts/check-labels.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,11 @@ module.exports = async ({github, context, core}, formulae_detect, dependent_test
}

const test_bot_formulae_args = ["--only-formulae", "--junit", "--only-json-tab", "--skip-dependents"]
test_bot_formulae_args.push(`--testing-formulae="${formulae_detect.testing_formulae}"`)
test_bot_formulae_args.push(`--added-formulae="${formulae_detect.added_formulae}"`)
test_bot_formulae_args.push(`--deleted-formulae="${formulae_detect.deleted_formulae}"`)

const test_bot_dependents_args = ["--only-formulae-dependents", "--junit"]
test_bot_dependents_args.push(`--testing-formulae="${formulae_detect.testing_formulae}"`)
test_bot_dependents_args.push(`--tested-formulae="${formulae_detect.testing_formulae}"`)

if (label_names.includes(`CI-test-bot-fail-fast${deps_suffix}`)) {
console.log(`CI-test-bot-fail-fast${deps_suffix} label found. Passing --fail-fast to brew test-bot.`)
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,15 @@ jobs:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
HOMEBREW_GITHUB_API_TOKEN: ${{secrets.GITHUB_TOKEN}}
BOTTLES_DIR: ${{matrix.workdir || github.workspace}}/bottles
TESTING_FORMULAE: ${{matrix.testing_formulae}}
steps:
- name: Pre-test steps
uses: Homebrew/actions/pre-build@master
with:
bottles-directory: ${{ env.BOTTLES_DIR }}
cleanup: ${{ matrix.cleanup }}

- run: brew test-bot ${{ needs.setup_tests.outputs.test-bot-formulae-args }}
- run: brew test-bot ${{ needs.setup_tests.outputs.test-bot-formulae-args }} --testing-formulae="$TESTING_FORMULAE"
id: brew-test-bot-formulae
working-directory: ${{ env.BOTTLES_DIR }}

Expand Down Expand Up @@ -337,6 +338,7 @@ jobs:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
HOMEBREW_GITHUB_API_TOKEN: ${{secrets.GITHUB_TOKEN}}
BOTTLES_DIR: ${{matrix.workdir || github.workspace}}/bottles
TESTING_FORMULAE: ${{matrix.testing_formulae}}
steps:
- name: Pre-test steps
uses: Homebrew/actions/pre-build@master
Expand All @@ -345,7 +347,7 @@ jobs:
cleanup: ${{ matrix.cleanup }}
download-bottles: true

- run: brew test-bot ${{ needs.setup_dep_tests.outputs.test-bot-dependents-args }}
- run: brew test-bot ${{ needs.setup_dep_tests.outputs.test-bot-dependents-args }} --testing-formulae="$TESTING_FORMULAE"
working-directory: ${{ env.BOTTLES_DIR }}

- name: Steps summary and cleanup
Expand Down
Loading