Skip to content

Commit 66a7197

Browse files
committed
Reorder to match other workflows
1 parent f36e518 commit 66a7197

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

.github/workflows/create-release-branch.yaml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ jobs:
2525
scope: DataDog/dd-trace-java
2626
policy: self.update-system-tests.create-pr
2727

28+
- name: Checkout dd-trace-java at tag
29+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
30+
2831
- name: Determine tag
2932
id: determine-tag
3033
run: |
@@ -43,11 +46,7 @@ jobs:
4346
id: define-branch
4447
run: |
4548
TAG=${{ steps.determine-tag.outputs.tag }}
46-
# echo "branch=release/${TAG%.0}.x" >> "$GITHUB_OUTPUT"
47-
echo "branch=release/v0.0.x" >> "$GITHUB_OUTPUT"
48-
49-
- name: Checkout dd-trace-java at tag
50-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
49+
echo "branch=release/${TAG%.0}.x" >> "$GITHUB_OUTPUT"
5150
5251
# - name: Check if branch already exists
5352
# id: check-branch
@@ -67,15 +66,15 @@ jobs:
6766
# git checkout -b "${{ steps.define-branch.outputs.branch }}"
6867
# git push -u origin "${{ steps.define-branch.outputs.branch }}"
6968

70-
- name: Define temp branch name
71-
# if: steps.check-branch.outputs.creating_new_branch == 'true'
72-
id: define-temp-branch
73-
run: echo "branch=ci/pin-system-tests-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
74-
7569
- name: Update system-tests references to latest commit SHA on main
7670
# if: steps.check-branch.outputs.creating_new_branch == 'true'
7771
run: BRANCH=main ./tooling/update_system_test_reference.sh
7872

73+
- name: Define temp branch name
74+
# if: steps.check-branch.outputs.creating_new_branch == 'true'
75+
id: define-temp-branch
76+
run: echo "temp-branch=ci/pin-system-tests-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
77+
7978
- name: Commit changes
8079
# if: steps.check-branch.outputs.creating_new_branch == 'true'
8180
id: create-commit
@@ -90,7 +89,7 @@ jobs:
9089
uses: DataDog/commit-headless@5a0f3876e0fbdd3a86b3e008acf4ec562db59eee # action/v2.0.1
9190
with:
9291
token: "${{ steps.octo-sts.outputs.token }}"
93-
branch: "${{ steps.define-temp-branch.outputs.branch }}"
92+
branch: "${{ steps.define-temp-branch.outputs.temp-branch }}"
9493
head-sha: "${{ github.sha }}"
9594
create-branch: true
9695
command: push
@@ -101,9 +100,9 @@ jobs:
101100
env:
102101
GH_TOKEN: ${{ steps.octo-sts.outputs.token }}
103102
run: |
104-
gh pr create --title "Pin system-tests for ${{ steps.define-branch.outputs.branch }}" \
103+
gh pr create --title "Pin system-tests for ${{ steps.define-branch.outputs.branch }}" \
105104
--base "${{ steps.define-branch.outputs.branch }}" \
106-
--head "${{ steps.define-temp-branch.outputs.branch }}" \
105+
--head "${{ steps.define-temp-branch.outputs.temp-branch }}" \
107106
--label "tag: dependencies" \
108107
--label "tag: no release notes" \
109108
--body "This PR pins the system-tests reference for the release branch."

0 commit comments

Comments
 (0)