Skip to content

Commit

Permalink
[workflows/rebase-on-upstream.yml] Pass actual HEAD of upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
dirkf authored and github-actions[bot] committed Aug 1, 2023
1 parent db92346 commit d9e081e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/rebase-on-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down

0 comments on commit d9e081e

Please sign in to comment.