Skip to content

[backport][security] Make bump action allowed on the v2 branch #230

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 2, 2025
Merged

[backport][security] Make bump action allowed on the v2 branch #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37e0a3b
Make bump workflow pass on the `v2` branch
yoannmoinet Sep 23, 2025
98f803f
Update action to support multiple base branches
yoannmoinet Sep 23, 2025
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
6 changes: 3 additions & 3 deletions .github/chainguard/self.bump.sts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
issuer: https://token.actions.githubusercontent.com

subject_pattern: repo:DataDog/build-plugins:ref:refs/heads/master
subject_pattern: repo:DataDog/build-plugins:ref:refs/heads/(master|v2)

claim_pattern:
event_name: workflow_dispatch
ref: refs/heads/master
ref: refs/heads/(master|v2)
ref_protected: "true"
job_workflow_ref: DataDog/build-plugins/.github/workflows/bump.yaml@.*
job_workflow_ref: DataDog/build-plugins/\.github/workflows/bump\.yaml@refs/heads/(master|v2)

permissions:
contents: write # Required to create tags and push the bump commit
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/bump.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,15 @@ jobs:
TAG_NAME="v$VERSION"
echo "Tag name: $TAG_NAME"

CURRENT_BRANCH_NAME="${{ github.head_ref || github.ref_name }}"
echo "Current branch name: $CURRENT_BRANCH_NAME"

BRANCH_NAME="bump-version-$TAG_NAME"
echo "Branch name: $BRANCH_NAME"


# Outputs for the next steps.
echo "current_branch_name=$CURRENT_BRANCH_NAME" >> $GITHUB_OUTPUT
echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
echo "version=$VERSION" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -109,7 +113,7 @@ jobs:
PR_URL=$(gh pr create \
--title "$TITLE" \
--body "This PR bumps the package versions to \`${{ steps.vars.outputs.tag_name }}\`" \
--base master \
--base "${{ steps.vars.outputs.current_branch_name }}" \
--head "${{ steps.vars.outputs.branch_name }}")
OUTPUT="### PR Created\n**[$TITLE]($PR_URL)**"
echo -e "$OUTPUT" >> $GITHUB_STEP_SUMMARY
Expand Down