[workflows/rebase-on-upstream.yml] Pass actual HEAD of upstream
This commit is contained in:
parent
b3fae3b23e
commit
9a82639c3d
|
@ -21,6 +21,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
echo "HEAD_NOW=$(git rev-parse HEAD)" >> "$GITHUB_ENV"
|
echo "HEAD_NOW=$(git rev-parse HEAD)" >> "$GITHUB_ENV"
|
||||||
- name: Rebase
|
- name: Rebase
|
||||||
|
# fetches upstream as git remote `upstream`
|
||||||
uses: ytdl-org/ytdl-patched-rebase-upstream-action@master
|
uses: ytdl-org/ytdl-patched-rebase-upstream-action@master
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GH_PAT }}
|
token: ${{ secrets.GH_PAT }}
|
||||||
|
@ -30,7 +31,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
NEW_HEAD=$(git rev-parse HEAD)
|
NEW_HEAD=$(git rev-parse HEAD)
|
||||||
[ "${{ env.HEAD_NOW }}" = "$NEW_HEAD" ] || echo "build-commit=$NEW_HEAD" >> "$GITHUB_OUTPUT"
|
[ "${{ env.HEAD_NOW }}" = "$NEW_HEAD" ] || echo "build-commit=$(git rev-parse upstream/master)" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
build:
|
build:
|
||||||
needs: rebase
|
needs: rebase
|
||||||
|
|
Loading…
Reference in New Issue