File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change 7
7
8
8
jobs :
9
9
sync :
10
+ name : Sync repository with upstream repository
10
11
runs-on : ubuntu-latest
12
+ permissions :
13
+ contents : write
14
+ actions : write
11
15
steps :
12
16
- name : Checkout fork
13
17
uses : actions/checkout@v4
@@ -22,13 +26,13 @@ jobs:
22
26
23
27
- name : Add upstream remote
24
28
run : |
25
- git remote add upstream git@ github.com: codegouvfr/sill.git
29
+ git remote add upstream https:// github.com/ codegouvfr/sill.git
26
30
git fetch upstream
27
31
28
- - name : Merge upstream/main
32
+ - name : Sync with upstream/main
29
33
run : |
30
34
git checkout main
31
- git rebase upstream/main
35
+ git reset --hard upstream/main
32
36
33
37
- name : Push to origin
34
- run : git push origin main --no-verify
38
+ run : git push origin main --force-with-lease -- no-verify
You can’t perform that action at this time.
0 commit comments