Skip to content

Commit

Permalink
Add --force to the release pushes performed by the CI
Browse files Browse the repository at this point in the history
If the `deploy` step fails, the Github Actions run will be two commits
behind the tip of the branch. We must allow the workflow to remove the
last two (automatic) commits from the branch.

Repos should use a `concurrency` setting to prevent Github Actions from
removing manually added commits.
  • Loading branch information
ppkarwasz committed Oct 18, 2023
1 parent d980925 commit 13ee5ca
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-release-reusable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
git config user.name "ASF Logging Services RM"
git config user.email private@logging.apache.org
git commit -S pom.xml -m "Set version to \`$PROJECT_VERSION\`"
git push origin
git push -f origin
fi
- name: Release changelog
Expand All @@ -128,7 +128,7 @@ jobs:
git config user.name "ASF Logging Services RM"
git config user.email private@logging.apache.org
git commit -S src -m "Release changelog for version \`$PROJECT_VERSION\`"
git push origin
git push -f origin
fi
- name: Build the website
Expand Down

0 comments on commit 13ee5ca

Please sign in to comment.