diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 7b6940f..545335d 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -18,6 +18,8 @@ jobs: - uses: actions/checkout@v3 with: ref: develop + - name: Fetches all branches + run: git fetch origin --unshallow - name: Set up python id: setup-python uses: actions/setup-python@v2 @@ -43,7 +45,7 @@ jobs: id: git-cliff with: config: cliff.toml - args: --verbose + args: origin/main ..HEAD env: OUTPUT: CHANGELOG.md - name: Commit changelog @@ -64,8 +66,7 @@ jobs: run: git push origin release/v$VERSION - name: Update main branch run: | - git fetch origin --unshallow - git checkout -b main origin/main + git checkout -b main origin/main git merge origin/release/v$VERSION git push origin main - name: Publish to pypi @@ -75,7 +76,7 @@ jobs: pypi_token: ${{ secrets.PYPI_TOKEN }} - name: Update develop branch run: | - git checkout -b develop origin/develop + git checkout develop git merge origin/main git push origin develop