From e4ea889239acbad69f15a8edf54e3fc253b88069 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 28 Feb 2025 16:38:27 +0200 Subject: [PATCH] Merge upstream/main into sync-with-upstream with conflicts --- .github/workflows/on-pull-request.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml index fac71fb..ab57573 100644 --- a/.github/workflows/on-pull-request.yaml +++ b/.github/workflows/on-pull-request.yaml @@ -37,7 +37,7 @@ jobs: BASE_BRANCH: ${{ github.event.pull_request.base.ref }} # Check token under Olli's account GH_TOKEN: ${{ secrets.FORK_ORGANISATION_TOKEN }} - FORK_REPOSITORY_PATH: "${{ secrets.FORK_REPOSITORY_ORGANISATION }}/${{ secrets.FORK_REPOSITORY_NAME }}" + FORK_REPOSITORY_PATH: "${{ env.FORK_REPOSITORY_ORGANISATION }}/${{ env.FORK_REPOSITORY_NAME }}" steps: - name: Check if PR branch exists in Farajaland repository id: check_branch @@ -65,8 +65,8 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - repository: '${{ secrets.FORK_REPOSITORY_ORGANISATION }}/${{ secrets.FORK_REPOSITORY_NAME }}' - # path: '${{ secrets.FORK_REPOSITORY_NAME }}' + repository: '${{ env.FORK_REPOSITORY_ORGANISATION }}/${{ env.FORK_REPOSITORY_NAME }}' + # path: '${{ env.FORK_REPOSITORY_NAME }}' - if: steps.sync_fork.outcome == 'failure' name: Set up Git run: | @@ -94,7 +94,7 @@ jobs: run: | git push https://x-access-token:${{ secrets.FORK_ORGANISATION_TOKEN }}@github.com/${FORK_REPOSITORY_PATH}.git sync-with-${BASE_BRANCH} - - name: Create PR in ${{ secrets.FORK_REPOSITORY_ORGANISATION }}/${{ secrets.FORK_REPOSITORY_NAME }} + - name: Create PR in ${{ env.FORK_REPOSITORY_ORGANISATION }}/${{ env.FORK_REPOSITORY_NAME }} if: steps.sync_fork.outcome == 'failure' run: | if gh pr create \