Skip to content

Commit 0d88424

Browse files
authored
Merge pull request #699 from github/henrymercer/allow-latest-checks-to-be-required
Always run the `latest` tools PR checks so we can make them required
2 parents 8c8a933 + 1263b9c commit 0d88424

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

.github/workflows/pr-checks.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,12 @@ jobs:
350350
echo "Default CodeQL bundle version is $CODEQL_VERSION_DEFAULT"
351351
echo "Latest CodeQL bundle version is $CODEQL_VERSION_LATEST"
352352
echo "Nightly CodeQL bundle version is $CODEQL_VERSION_NIGHTLY"
353-
if [[ "$CODEQL_VERSION_DEFAULT" == "$CODEQL_VERSION_LATEST" ]]; then
354-
# Skip `tools: latest` since it would be the same as `tools: null`
355-
VERSIONS_JSON="[null, \"$NIGHTLY_URL\"]"
356-
else
357-
# Run integration tests with all three bundles.
358-
VERSIONS_JSON="[null, \"$NIGHTLY_URL\", \"latest\"]"
359-
fi
353+
354+
# Run integration tests with all three bundles, even if `tools: latest` would be the same as
355+
# `tools: null`. This allows us to make all three kinds of integration tests required status
356+
# checks on PRs.
357+
VERSIONS_JSON="[null, \"$NIGHTLY_URL\", \"latest\"]"
358+
360359
# Output a JSON-encoded list with the distinct versions to test against.
361360
echo "Suggested matrix config for integration tests: $VERSIONS_JSON"
362361
echo "::set-output name=versions::${VERSIONS_JSON}"

0 commit comments

Comments
 (0)