Skip to content

Adjust create-release-branch workflow #9833

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
sarahchen6 merged 1 commit into from
Oct 22, 2025
Merged

Adjust create-release-branch workflow #9833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .github/chainguard/self.update-system-tests.push.sts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ claim_pattern:

permissions:
contents: write
pull_requests: write
36 changes: 32 additions & 4 deletions .github/workflows/create-release-branch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,24 @@ jobs:
echo "Branch $BRANCH does not exist - proceeding with following steps"
fi

- name: Push empty release branch
if: steps.check-branch.outputs.creating_new_branch == 'true'
uses: DataDog/commit-headless@5a0f3876e0fbdd3a86b3e008acf4ec562db59eee # action/v2.0.1
with:
token: "${{ steps.octo-sts.outputs.token }}"
branch: "${{ steps.define-branch.outputs.branch }}"
head-sha: "${{ github.sha }}"
create-branch: true
command: push
commits: ""

- name: Define temp branch name
if: steps.check-branch.outputs.creating_new_branch == 'true'
id: define-temp-branch
run: |
TEMP_BRANCH="${{ steps.define-branch.outputs.branch }}-pin-system-tests"
echo "branch=${TEMP_BRANCH}" >> "$GITHUB_OUTPUT"

- name: Update system-tests references to latest commit SHA on main
if: steps.check-branch.outputs.creating_new_branch == 'true'
run: BRANCH=main ./tooling/update_system_test_reference.sh
Expand All @@ -73,15 +91,25 @@ jobs:
git commit -m "chore: Pin system-tests for release branch" .github/workflows/run-system-tests.yaml
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT

- name: Push changes
- name: Push changes to temp branch
if: steps.check-branch.outputs.creating_new_branch == 'true'
uses: DataDog/commit-headless@5a0f3876e0fbdd3a86b3e008acf4ec562db59eee # action/v2.0.1
with:
token: "${{ steps.octo-sts.outputs.token }}"
branch: "${{ steps.define-branch.outputs.branch }}"
# for scheduled runs, sha is the tip of the default branch
# for dispatched runs, sha is the tip of the branch it was dispatched on
branch: "${{ steps.define-temp-branch.outputs.branch }}"
head-sha: "${{ github.sha }}"
create-branch: true
command: push
commits: "${{ steps.create-commit.outputs.commit }}"

- name: Create pull request from temp branch to release branch
if: steps.check-branch.outputs.creating_new_branch == 'true'
env:
GH_TOKEN: ${{ steps.octo-sts.outputs.token }}
run: |
gh pr create --title "Pin system-tests for ${{ steps.define-branch.outputs.branch }}" \
--base "${{ steps.define-branch.outputs.branch }}" \
--head "${{ steps.define-temp-branch.outputs.branch }}" \
--label "tag: dependencies" \
--label "tag: no release notes" \
--body "This PR pins the system-tests reference for the release branch."
Loading