Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
- cron: '0 0 1 * *'
workflow_dispatch:

permissions:
pull-requests: write

jobs:
sync-upstream:
runs-on: ubuntu-latest
Expand All @@ -32,7 +29,7 @@ jobs:
- name: Fetch upstream & generate branch name & check for new commits
id: check_commits
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.SYNC_PAT }}
run: |
gh repo set-default ${{ github.repository }} # Set the default repo to the origin repository
git remote add upstream ${{ env.UPSTREAM }}
Expand Down Expand Up @@ -82,7 +79,7 @@ jobs:
id: create_pr
if: steps.check_commits.outputs.skip == 'false'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.SYNC_PAT }}
run: |
# Execute the generated PR creation script
./contrib/gh-pr-create.sh
Expand Down
2 changes: 1 addition & 1 deletion contrib/sync-upstream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ PR_BRANCH=$1
range

TITLE="Upstream PRs"
BODY=""
BODY="${GITHUB_ACTIONS+This PR has been created by a GitHub Actions workflow without human involvement.}"$'\n'
for COMMIT in $COMMITS
do
PRNUM=$(git log -1 "$COMMIT" --pretty=format:%s | sed s/'Merge \(bitcoin-core\/secp256k1\)\?#\([0-9]*\).*'/'\2'/)
Expand Down
Loading