Bump the Action minor version number on new CodeQL minor version series #3427
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -57,6 +57,20 @@ jobs: | |||||||||
| - name: Update bundle | ||||||||||
| uses: ./.github/actions/update-bundle | ||||||||||
|
|
||||||||||
| - name: Bump action minor version for new CodeQL minor version series | ||||||||||
| id: bump-action-version | ||||||||||
| run: | | ||||||||||
| cli_version=$(jq -r '.cliVersion' src/defaults.json) | ||||||||||
| # Check if this is a new minor version series (patch version is 0) | ||||||||||
| if [[ "$cli_version" =~ ^[0-9]+\.[0-9]+\.0$ ]]; then | ||||||||||
| echo "New CodeQL minor version series detected ($cli_version), bumping action minor version" | ||||||||||
| npm version minor --no-git-tag-version | ||||||||||
| echo "bumped=true" >> "$GITHUB_OUTPUT" | ||||||||||
| else | ||||||||||
| echo "Not a new minor version series ($cli_version), skipping action version bump" | ||||||||||
| echo "bumped=false" >> "$GITHUB_OUTPUT" | ||||||||||
| fi | ||||||||||
|
|
||||||||||
| - name: Rebuild Action | ||||||||||
| run: npm run build | ||||||||||
|
|
||||||||||
|
|
@@ -71,11 +85,21 @@ jobs: | |||||||||
| - name: Open pull request | ||||||||||
| env: | ||||||||||
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||||||||||
| ACTION_VERSION_BUMPED: ${{ steps.bump-action-version.outputs.bumped }} | ||||||||||
| run: | | ||||||||||
| cli_version=$(jq -r '.cliVersion' src/defaults.json) | ||||||||||
| action_version=$(jq -r '.version' package.json) | ||||||||||
|
|
||||||||||
| pr_body="This pull request updates the default CodeQL bundle, as used with \`tools: linked\` and on GHES, to $cli_version." | ||||||||||
| if [[ "$ACTION_VERSION_BUMPED" == "true" ]]; then | ||||||||||
| pr_body="$pr_body | ||||||||||
|
|
||||||||||
| Since this is a new CodeQL minor version series, this PR also bumps the Action version to $action_version." | ||||||||||
|
There was a problem hiding this comment. The multi-line
Suggested change
Member
There was a problem hiding this comment. Minor: This is a bit horrible. Perhaps in a follow-up, see if you can make this nicer |
||||||||||
| fi | ||||||||||
|
|
||||||||||
| pr_url=$(gh pr create \ | ||||||||||
| --title "Update default bundle to $cli_version" \ | ||||||||||
| --body "$pr_body" \ | ||||||||||
| --assignee "$GITHUB_ACTOR" \ | ||||||||||
| --draft \ | ||||||||||
| ) | ||||||||||
|
|
||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "codeql", | ||
| "version": "4.32.0", | ||
| "private": true, | ||
| "description": "CodeQL action", | ||
| "scripts": { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This logic breaks if we ever need to skip a
.0CLI release and go straight to.1or higher. I think ideally we'd extract the minor CLI version fromsrc/defaults.jsonbefore the./.github/actions/update-bundlestep and then compare it to the one here. Not urgent, so feel free to do that in a follow-up PR.