From fd1073d92a99e6ca651eea231e78bd80cfbb8cae Mon Sep 17 00:00:00 2001
From: Sarah Chen <sarah.chen@datadoghq.com>
Date: Wed, 12 Nov 2025 11:49:47 -0500
Subject: [PATCH 1/2] Make sure commit is being pushed to master SHA

---
 .github/workflows/create-release-branch.yaml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/create-release-branch.yaml b/.github/workflows/create-release-branch.yaml
index 0fadc2d4996..a7601a03caa 100644
--- a/.github/workflows/create-release-branch.yaml
+++ b/.github/workflows/create-release-branch.yaml
@@ -3,7 +3,7 @@ name: Create Release Branch and Pin System-Tests
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.0'  # Trigger on minor release tags (e.g. v1.54.0)
+      - 'v[0-9]+.[0-9]+.0' # Trigger on minor release tags (e.g. v1.54.0)
   workflow_dispatch:
     inputs:
       tag:
@@ -15,8 +15,7 @@ jobs:
   create-release-branch:
     runs-on: ubuntu-latest
     permissions:
-      # contents: write # Allow pushing the empty release branch
-      contents: read
+      contents: write # Allow pushing the empty release branch
       id-token: write # Required for OIDC token federation
     steps:
       - uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
@@ -27,6 +26,12 @@ jobs:
 
       - name: Checkout dd-trace-java at tag
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
+        with:
+          ref: master
+
+      - name: Get head SHA of master branch
+        id: get-head-sha
+        run: echo "sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
 
       - name: Determine tag
         id: determine-tag
@@ -90,7 +95,7 @@ jobs:
         with:
           token: "${{ steps.octo-sts.outputs.token }}"
           branch: "${{ steps.define-temp-branch.outputs.temp-branch }}"
-          head-sha: "${{ github.sha }}"
+          head-sha: "${{ steps.get-head-sha.outputs.sha }}"
           create-branch: true
           command: push
           commits: "${{ steps.create-commit.outputs.commit }}"

From 0dcf92da03796491459fc6ed15c592e2ece423a2 Mon Sep 17 00:00:00 2001
From: Sarah Chen <sarah.chen@datadoghq.com>
Date: Wed, 12 Nov 2025 11:55:45 -0500
Subject: [PATCH 2/2] Specify checking out master branch

---
 .github/workflows/create-release-branch.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/create-release-branch.yaml b/.github/workflows/create-release-branch.yaml
index a7601a03caa..0cfa6d57ea7 100644
--- a/.github/workflows/create-release-branch.yaml
+++ b/.github/workflows/create-release-branch.yaml
@@ -24,7 +24,7 @@ jobs:
           scope: DataDog/dd-trace-java
           policy: self.update-system-tests.create-pr
 
-      - name: Checkout dd-trace-java at tag
+      - name: Checkout dd-trace-java master branch
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
         with:
           ref: master