[workflows/rebase-on-upstream.yml] Pass actual HEAD of upstream

This commit is contained in:
dirkf 2023-07-23 21:14:41 +01:00
parent b3fae3b23e
commit 9a82639c3d
1 changed files with 2 additions and 1 deletions

View File

@ -21,6 +21,7 @@ jobs:
run: |
echo "HEAD_NOW=$(git rev-parse HEAD)" >> "$GITHUB_ENV"
- name: Rebase
# fetches upstream as git remote `upstream`
uses: ytdl-org/ytdl-patched-rebase-upstream-action@master
with:
token: ${{ secrets.GH_PAT }}
@ -30,7 +31,7 @@ jobs:
shell: bash
run: |
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:
needs: rebase