Skip to content

Commit

Permalink
ci: 🎡 pull with fast-forward before semantic release
Browse files Browse the repository at this point in the history
  • Loading branch information
darvid committed Oct 12, 2024
1 parent 73f276b commit 24e87e0
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Check if release needed
id: release
uses: python-semantic-release/[email protected].0
uses: python-semantic-release/[email protected].1
with:
force: "patch"
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -45,7 +45,7 @@ jobs:
commit: "true"

- name: Download artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v4.1.8
if: github.event_name == 'workflow_dispatch' || steps.release.outputs.released == 'true'

- name: Prepare dist
Expand All @@ -64,8 +64,13 @@ jobs:
git checkout -b ${RELEASE_PR_BRANCH}
git branch --set-upstream-to=${RELEASE_PR_BRANCH}
- name: Pull and fast forward
if: steps.release.outputs.released == 'true'
run: |
git pull --ff origin ${RELEASE_PR_BRANCH}
- name: Semantic release
uses: python-semantic-release/[email protected].0
uses: python-semantic-release/[email protected].1
if: steps.release.outputs.released == 'true'
with:
force: "patch"
Expand Down

0 comments on commit 24e87e0

Please sign in to comment.