From 24e87e060dcc4240a4e8143abe76c1efe6ce9727 Mon Sep 17 00:00:00 2001 From: David Gidwani Date: Sat, 12 Oct 2024 16:43:12 -0400 Subject: [PATCH] ci: :ferris_wheel: pull with fast-forward before semantic release --- .github/workflows/release.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0021077..229502b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: - name: Check if release needed id: release - uses: python-semantic-release/python-semantic-release@v9.10.0 + uses: python-semantic-release/python-semantic-release@v9.10.1 with: force: "patch" github_token: ${{ secrets.GITHUB_TOKEN }} @@ -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 @@ -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/python-semantic-release@v9.10.0 + uses: python-semantic-release/python-semantic-release@v9.10.1 if: steps.release.outputs.released == 'true' with: force: "patch"