From 55caa96b745d3371d9cfcbb02d8bc476f6b71225 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Fri, 8 Dec 2023 01:57:40 +0100 Subject: [PATCH] last change --- .github/workflows/sync-from-fork.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sync-from-fork.yml b/.github/workflows/sync-from-fork.yml index 7294239a0f8f1..236216f0dd0f1 100644 --- a/.github/workflows/sync-from-fork.yml +++ b/.github/workflows/sync-from-fork.yml @@ -30,7 +30,7 @@ jobs: run: echo "No changes needed to be synchronised" sync: env: - GITHUB_TOKEN: ${{ secrets.GH_PAT }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} needs: check-for-changes runs-on: ubuntu-latest steps: @@ -41,14 +41,20 @@ jobs: git checkout -b mirror git remote add github "https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY.git" git push -u github mirror + create-pr: + env: + GITHUB_TOKEN: ${{ secrets.GH_PAT }} + needs: sync + runs-on: ubuntu-latest + steps: - name: Create PR run: | - gh pr create --title "Fork Sync: Update from parent repository" --body "This PR was automatically created by a GitHub Action triggered by a cron schedule. Please review the changes and merge if appropriate." --base master --head mirror --repo ${GITHUB_REPOSITORY} + gh pr create --title "Fork Sync: Update from parent repository" --body "This PR was automatically created by a GitHub Action triggered by a cron schedule. Please review the changes and merge if appropriate." --base master --head mirror --repo ${GITHUB_REPOSITORY} || true update-pr-desc: - needs: sync + needs: create-pr runs-on: ubuntu-latest env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GH_PAT }} UPSTREAM_URL: "https://github.com/gorhill/ublock.git" steps: - uses: actions/checkout@v3