Skip to content

Commit 565bab7

Browse files
committed
ci: fix sync upstream workflow
1 parent e50a053 commit 565bab7

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

.github/workflows/sync-upstream.yaml

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

88
jobs:
99
sync:
10+
name: Sync repository with upstream repository
1011
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
14+
actions: write
1115
steps:
1216
- name: Checkout fork
1317
uses: actions/checkout@v4
@@ -22,13 +26,13 @@ jobs:
2226
2327
- name: Add upstream remote
2428
run: |
25-
git remote add upstream git@github.com:codegouvfr/sill.git
29+
git remote add upstream https://github.com/codegouvfr/sill.git
2630
git fetch upstream
2731
28-
- name: Merge upstream/main
32+
- name: Sync with upstream/main
2933
run: |
3034
git checkout main
31-
git rebase upstream/main
35+
git reset --hard upstream/main
3236
3337
- name: Push to origin
34-
run: git push origin main --no-verify
38+
run: git push origin main --force-with-lease --no-verify

0 commit comments

Comments
 (0)