Skip to content

Commit b125719

Browse files
committed
fix(ci): setup git client earlier to prevent dirty stash error
1 parent d6b091d commit b125719

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

.github/workflows/release.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,13 @@ jobs:
7979
- name: Run all tests, linting and baselines
8080
if: ${{ !inputs.skip_code_quality }}
8181
run: make pr
82+
- name: Git client setup and refresh tip
83+
run: |
84+
git config user.name "Release bot"
85+
git config user.email "[email protected]"
86+
git config pull.rebase true
87+
git config remote.origin.url >&- || git remote add origin https://github.com/"${ORIGIN}" # Git Detached mode (release notes) doesn't have origin
88+
git pull origin "${BRANCH}"
8289
- name: Bump package version
8390
id: versioning
8491
run: poetry version "${RELEASE_VERSION}"
@@ -97,14 +104,6 @@ jobs:
97104
env:
98105
PYPI_USERNAME: __token__
99106
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
100-
- name: Git client setup and refresh tip
101-
if: steps.versioning.outcome == 'success'
102-
run: |
103-
git config user.name "Release bot"
104-
git config user.email "[email protected]"
105-
git config pull.rebase true
106-
git config remote.origin.url >&- || git remote add origin https://github.com/"${ORIGIN}" # Git Detached mode (release notes) doesn't have origin
107-
git pull origin "${BRANCH}"
108107
- name: Update version in trunk
109108
if: steps.versioning.outcome == 'success'
110109
run: |

0 commit comments

Comments
 (0)