Merge pull request #183917 from Homebrew/revert-182754-revert-matrix-…

…testing-formulae workflows/tests: use testing formulae from `determine-test-runners` (again)
Homebrew · Sep 12, 2024 · e89428d · e89428d
2 parents 4069d63 + eef391a
commit e89428d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/scripts/check-labels.js b/.github/workflows/scripts/check-labels.js
@@ -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.`)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -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 }}
 
@@ -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
@@ -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