fix(ci): force-with-lease when syncing develop after release

Squash merges to master diverge from develop; a plain fast-forward push
to develop is rejected after every release.
pull/13/head
Rodrigo Pérez 3 months ago
parent 2805c1a43a
commit 9b9a11b1d1

@ -72,5 +72,8 @@ jobs:
- name: Sync develop from master
if: steps.semantic.outputs.released == 'true'
run: |
git fetch origin master
git push origin origin/master:refs/heads/develop
set -euo pipefail
git fetch origin master develop
# Squash merges to master diverge from develop; reset develop to released master.
git push origin origin/master:refs/heads/develop \
--force-with-lease=refs/heads/develop:refs/remotes/origin/develop

Loading…
Cancel
Save

Powered by TurnKey Linux.