Merge pull request 'cron: reset origin remote url, so that next step's git fetch works' (#52) from fix/main-branch-upstream-cron into main
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/52 Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
This commit is contained in:
commit
6475e7563f
|
@ -22,6 +22,7 @@ steps:
|
||||||
- git checkout -b devos --track origin/devos
|
- git checkout -b devos --track origin/devos
|
||||||
- git merge -X theirs devos/main
|
- git merge -X theirs devos/main
|
||||||
- git push origin devos
|
- git push origin devos
|
||||||
|
- git remote set-url origin https://git.b12f.io/pub-solar/os.git
|
||||||
|
|
||||||
- name: "Sync $BRANCH with upstream"
|
- name: "Sync $BRANCH with upstream"
|
||||||
image: alpine/git
|
image: alpine/git
|
||||||
|
|
Loading…
Reference in a new issue