From 743d8dfb6e35a4d6221094d7c096c9af4996f991 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 11 Aug 2021 13:01:33 +0100 Subject: [PATCH] Always run the `latest` tools PR checks so we can make them required --- .github/workflows/pr-checks.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 47c301d409..2192cba300 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -350,13 +350,12 @@ jobs: echo "Default CodeQL bundle version is $CODEQL_VERSION_DEFAULT" echo "Latest CodeQL bundle version is $CODEQL_VERSION_LATEST" echo "Nightly CodeQL bundle version is $CODEQL_VERSION_NIGHTLY" - if [[ "$CODEQL_VERSION_DEFAULT" == "$CODEQL_VERSION_LATEST" ]]; then - # Skip `tools: latest` since it would be the same as `tools: null` - VERSIONS_JSON="[null, \"$NIGHTLY_URL\"]" - else - # Run integration tests with all three bundles. - VERSIONS_JSON="[null, \"$NIGHTLY_URL\", \"latest\"]" - fi + + # Run integration tests with all three bundles, even if `tools: latest` would be the same as + # `tools: null`. This allows us to make all three kinds of integration tests required status + # checks on PRs. + VERSIONS_JSON="[null, \"$NIGHTLY_URL\", \"latest\"]" + # Output a JSON-encoded list with the distinct versions to test against. echo "Suggested matrix config for integration tests: $VERSIONS_JSON" echo "::set-output name=versions::${VERSIONS_JSON}"