Skip to content

Commit

Permalink
Release pipeline update
Browse files Browse the repository at this point in the history
  • Loading branch information
HardNorth committed Apr 26, 2022
1 parent 3c521c4 commit 8b1f1a0
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ jobs:
user: ${{ secrets.PYPI_USERNAME }}
password: ${{ secrets.PYPI_PASSWORD }}

- name: Checkout develop branch
uses: actions/checkout@v2
with:
ref: 'develop'
fetch-depth: 0

- name: Update CHANGELOG.md
id: changelogUpdate
run: |
Expand All @@ -73,7 +79,6 @@ jobs:
mv ${{ env.CHANGE_LOG_FILE }}${{ env.TMP_SUFFIX }} ${{ env.CHANGE_LOG_FILE }}
git add ${{ env.CHANGE_LOG_FILE }}
git commit -m "Changelog update"
git push
- name: Read changelog Entry
id: readChangelogEntry
Expand All @@ -94,12 +99,6 @@ jobs:
draft: false
prerelease: false

- name: Checkout develop branch
uses: actions/checkout@v2
with:
ref: 'develop'
fetch-depth: 0

- name: Merge release branch into develop
id: mergeIntoDevelop
run: |
Expand All @@ -117,4 +116,4 @@ jobs:
mv ${{ env.VERSION_FILE }}${{ env.TMP_SUFFIX }} ${{ env.VERSION_FILE }}
git add ${{ env.VERSION_FILE }}
git commit -m "Version update"
git push origin develop
git push

0 comments on commit 8b1f1a0

Please sign in to comment.