Skip to content

Commit 4ca2b0b

Browse files
committed
fixing wofkflows
1 parent 5fc159b commit 4ca2b0b

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

.github/workflows/create-tfe-release-notes.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ jobs:
4040
version: ${{ inputs.version }}
4141
secrets: inherit
4242
release-notes:
43-
needs: copy-docs
43+
needs: sync-docs
4444
runs-on: ubuntu-latest
4545
steps:
46-
- name: Print outputs from copy-docs
46+
- name: Print outputs from sync-docs
4747
run: |
48-
echo "release_branch_name: ${{ needs.copy-docs.outputs.release_branch_name }}"
49-
echo "diff_branch_pr_url: ${{ needs.copy-docs.outputs.diff_branch_pr_url }}"
50-
echo "release_branch_pr_url: ${{ needs.copy-docs.outputs.release_branch_pr_url }}"
48+
echo "release_branch_name: ${{ needs.sync-docs.outputs.release_branch_name }}"
49+
echo "diff_branch_pr_url: ${{ needs.sync-docs.outputs.diff_branch_pr_url }}"
50+
echo "release_branch_pr_url: ${{ needs.sync-docs.outputs.release_branch_pr_url }}"
5151
5252
- name: Only run in hashicorp/web-unified-docs-internal
5353
run: |
@@ -59,7 +59,7 @@ jobs:
5959
- name: Checkout web-unified-docs repository
6060
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
6161
with:
62-
ref: '${{ needs.copy-docs.outputs.release_branch_name }}'
62+
ref: '${{ needs.sync-docs.outputs.release_branch_name }}'
6363

6464
- name: Install and cache Ruby gems at root
6565
uses: ruby/setup-ruby@52753b7da854d5c07df37391a986c76ab4615999 # v1.191.0
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Turn branch into PR
7676
run: |
77-
export RELEASE_BRANCH_NAME="${{ needs.copy-docs.outputs.release_branch_name }}"
77+
export RELEASE_BRANCH_NAME="${{ needs.sync-docs.outputs.release_branch_name }}"
7878
RELEASE_NOTES_PR_URL=$(scripts/tfe-releases/ci/create-pull-request.sh)
7979
echo "RELEASE_NOTES_PR_URL=$RELEASE_NOTES_PR_URL" >> $GITHUB_ENV
8080
@@ -134,10 +134,10 @@ jobs:
134134
- ${{github.server_url}}/${{github.repository}}/actions/runs/${{github.run_id}}
135135
136136
Changes since last release, diff PR:
137-
- ${{ needs.copy-docs.outputs.diff_branch_pr_url }}
137+
- ${{ needs.sync-docs.outputs.diff_branch_pr_url }}
138138
139139
Release Notes PR:
140-
- ${{ needs.copy-docs.outputs.release_branch_pr_url }}
140+
- ${{ needs.sync-docs.outputs.release_branch_pr_url }}
141141
142142
143143
❗ This is the Release PR that will be merged into main, once the release notes and diff PR are merged into it. ❗
@@ -149,5 +149,5 @@ jobs:
149149
git config --global user.email "team-rel-eng@hashicorp.com"
150150
git config --global user.name "tfe-release-bot"
151151
152-
gh pr edit ${{ needs.copy-docs.outputs.release_branch_pr_url }} \
152+
gh pr edit ${{ needs.sync-docs.outputs.release_branch_pr_url }} \
153153
--body="${{env.docs_pr_body}}"

.github/workflows/sync-docs-for-tfe.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ on:
1414
required: true
1515
type: string
1616
outputs:
17-
release_branch_name:
18-
description: 'The name of the branch created for the new TFE version docs.'
19-
value: ${{ jobs.copy-docs.outputs.release_branch_name }}
20-
release_branch_pr_url:
21-
description: 'The URL of the release branch created for the new TFE version docs.'
22-
value: ${{ jobs.copy-docs.outputs.release_branch_pr_url }}
23-
diff_branch_pr_url:
24-
description: 'The URL of the diff branch created for the new TFE version docs.'
25-
value: ${{ jobs.copy-docs.outputs.diff_branch_pr_url }}
17+
release_branch_name:
18+
description: 'The name of the branch created for the new TFE version docs.'
19+
value: ${{ jobs.sync-docs.outputs.release_branch_name }}
20+
release_branch_pr_url:
21+
description: 'The URL of the release branch created for the new TFE version docs.'
22+
value: ${{ jobs.sync-docs.outputs.release_branch_pr_url }}
23+
diff_branch_pr_url:
24+
description: 'The URL of the diff branch created for the new TFE version docs.'
25+
value: ${{ jobs.sync-docs.outputs.diff_branch_pr_url }}
2626

2727
jobs:
2828
sync-docs:
@@ -110,7 +110,7 @@ jobs:
110110
git config --global user.name "tfe-release-bot"
111111
112112
git add .
113-
git commit -m "HCP TF changes for TFE release" --no-verify
113+
git commit -m "HCP TF changes for TFE release" --no-verify || echo "No changes to commit"
114114
git push origin HEAD
115115
116116
diff_pr_url=$(gh pr view --json url --jq '.url')

0 commit comments

Comments
 (0)