Skip to content

Commit 18e3b59

Browse files
committed
ci: fix sync upstream workflow
1 parent e50a053 commit 18e3b59

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.github/workflows/sync-upstream.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
jobs:
99
sync:
10+
name: Sync repository with upstream repository
1011
runs-on: ubuntu-latest
1112
steps:
1213
- name: Checkout fork
@@ -22,13 +23,13 @@ jobs:
2223
2324
- name: Add upstream remote
2425
run: |
25-
git remote add upstream git@github.com:codegouvfr/sill.git
26+
git remote add upstream https://github.com/codegouvfr/sill.git
2627
git fetch upstream
2728
28-
- name: Merge upstream/main
29+
- name: Sync with upstream/main
2930
run: |
3031
git checkout main
31-
git rebase upstream/main
32+
git reset --hard upstream/main
3233
3334
- name: Push to origin
34-
run: git push origin main --no-verify
35+
run: git push origin main --force-with-lease --no-verify

0 commit comments

Comments
 (0)