Update auto-update.yml
This commit is contained in:
parent
ce18f5e6e9
commit
0c62d8348a
|
@ -47,9 +47,9 @@ jobs:
|
||||||
with:
|
with:
|
||||||
ref: bot/auto-update
|
ref: bot/auto-update
|
||||||
- name: Fetch Origin
|
- name: Fetch Origin
|
||||||
run: git fetch origin --allow-unrelated-histories
|
run: git fetch origin
|
||||||
- name: Update from master
|
- name: Update from master
|
||||||
run: git merge origin/master
|
run: git merge --allow-unrelated-histories origin/master
|
||||||
- name: Generate Token
|
- name: Generate Token
|
||||||
uses: tibdex/github-app-token@v1
|
uses: tibdex/github-app-token@v1
|
||||||
id: generate-token
|
id: generate-token
|
||||||
|
|
Loading…
Reference in New Issue