frost/secp256k1-zkp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge BlockstreamResearch/secp256k1-zkp#353: sync-upstream: Restore SYNC_PAT

Browse Source 
e371ab5df0 sync-upstream: Restore SYNC_PAT for gh commands (DarkWindman)

Pull request description:

  This PR restores the `SYNC_PAT` requirement due to restrictions on opening PRs with the default 'GITHUB_TOKEN'.

  Since the authorship of the PR is now linked to the user who created the PAT, a note was added to the PR body to clarify that it was created by a GitHub Actions workflow and not by a human being.

  Additionally, the `permissions:` section has been removed, as `GITHUB_TOKEN` is no longer in use.

ACKs for top commit:
  real-or-random:
    ACK e371ab5df0

Tree-SHA512: e61fde9538edc95a049e1208894c5cafe2295180cc6d02e35a364974e04aba913c39256ac7293685919650021d97a1737075f782c11383b761f0979f8bd70e8a
This commit is contained in:
merge-script
2026-03-30 13:08:29 +02:00
parent ee5985375f e371ab5df0
commit 08d1cd0c9c
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/sync.yml vendored
View File

@@ -5,9 +5,6 @@ on:
- cron: '0 0 1 * *' - cron: '0 0 1 * *'
workflow_dispatch: workflow_dispatch:
permissions:
pull-requests: write
jobs: jobs:
sync-upstream: sync-upstream:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -32,7 +29,7 @@ jobs:
- name: Fetch upstream & generate branch name & check for new commits - name: Fetch upstream & generate branch name & check for new commits
id: check_commits id: check_commits
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.SYNC_PAT }}
run: | run: |
gh repo set-default ${{ github.repository }} # Set the default repo to the origin repository gh repo set-default ${{ github.repository }} # Set the default repo to the origin repository
git remote add upstream ${{ env.UPSTREAM }} git remote add upstream ${{ env.UPSTREAM }}
@@ -82,7 +79,7 @@ jobs:
id: create_pr id: create_pr
if: steps.check_commits.outputs.skip == 'false' if: steps.check_commits.outputs.skip == 'false'
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.SYNC_PAT }}
run: | run: |
# Execute the generated PR creation script # Execute the generated PR creation script
./contrib/gh-pr-create.sh ./contrib/gh-pr-create.sh

2
contrib/sync-upstream.sh
View File

@@ -69,7 +69,7 @@ PR_BRANCH=$1
range range
TITLE="Upstream PRs" 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 for COMMIT in $COMMITS
do do
PRNUM=$(git log -1 "$COMMIT" --pretty=format:%s | sed s/'Merge \(bitcoin-core\/secp256k1\)\?#\([0-9]*\).*'/'\2'/) PRNUM=$(git log -1 "$COMMIT" --pretty=format:%s | sed s/'Merge \(bitcoin-core\/secp256k1\)\?#\([0-9]*\).*'/'\2'/)