This commit is contained in:
parent
3faea15cf3
commit
2d16c92cb3
1 changed files with 3 additions and 0 deletions
|
|
@ -14,6 +14,7 @@ jobs:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
|
ref: master
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
token: ${{ secrets.PUSH_TOKEN }}
|
token: ${{ secrets.PUSH_TOKEN }}
|
||||||
|
|
||||||
|
|
@ -21,6 +22,8 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
git config user.name "forgejo-runner"
|
git config user.name "forgejo-runner"
|
||||||
git config user.email "runner@forge.jannis.wtf"
|
git config user.email "runner@forge.jannis.wtf"
|
||||||
|
git fetch origin master
|
||||||
|
git reset --hard origin/master
|
||||||
git remote add upstream https://github.com/linuxserver/docker-plex
|
git remote add upstream https://github.com/linuxserver/docker-plex
|
||||||
git fetch upstream
|
git fetch upstream
|
||||||
git merge upstream/master --no-edit
|
git merge upstream/master --no-edit
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue