diff --git a/.github/workflows/Build_Test_Pull_Request.yml b/.github/workflows/build-test-pull-request.yml similarity index 100% rename from .github/workflows/Build_Test_Pull_Request.yml rename to .github/workflows/build-test-pull-request.yml diff --git a/.github/workflows/create-sync-pr.yml b/.github/workflows/create-sync-pr.yml index 9959962635b..6ca84019700 100644 --- a/.github/workflows/create-sync-pr.yml +++ b/.github/workflows/create-sync-pr.yml @@ -11,20 +11,30 @@ jobs: if: github.event.pull_request.merged == true runs-on: ubuntu-latest permissions: - pull-requests: write - contents: read + pull-requests: write + contents: read steps: + - name: Check SOURCE_REPO + id: check_repo + env: + SOURCE_REPO: ${{ secrets.SOURCE_REPO_NAME }} + run: | + echo "::set-output name=is_correct_repo::$(if [[ "$SOURCE_REPO" == "makeplane/plane" ]]; then echo 'true'; else echo 'false'; fi)" + - name: Checkout Code + if: steps.check_repo.outputs.is_correct_repo == 'true' uses: actions/checkout@v2 with: persist-credentials: false fetch-depth: 0 - + - name: Set up Branch Name + if: steps.check_repo.outputs.is_correct_repo == 'true' run: | - echo "BRANCH_NAME=${{ github.head_ref }}" >> $GITHUB_ENV - + echo "SOURCE_BRANCH_NAME=${{ github.head_ref }}" >> $GITHUB_ENV + - name: Setup GH CLI + if: steps.check_repo.outputs.is_correct_repo == 'true' run: | type -p curl >/dev/null || (sudo apt update && sudo apt install curl -y) curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg @@ -34,24 +44,24 @@ jobs: sudo apt install gh -y - name: Create Pull Request + if: steps.check_repo.outputs.is_correct_repo == 'true' env: - GH_TOKEN: ${{ secrets.TOKEN }} + GH_TOKEN: ${{ secrets.ACCESS_TOKEN }} run: | - TARGET_REPO="makeplane/${{ secrets.REPO_NAME }}" - TARGET_BRANCH="${{ secrets.REPO_TARGET_BRANCH }}" - SOURCE_BRANCH="${{ env.BRANCH_NAME }}" - - git checkout $SOURCE_BRANCH - git remote add target "https://$GH_TOKEN@github.com/$TARGET_REPO.git" - git push target $SOURCE_BRANCH:$SOURCE_BRANCH - - PR_TITLE="${{ github.event.pull_request.title }}" - PR_BODY="${{ github.event.pull_request.body }}" - - gh pr create \ - --base $TARGET_BRANCH \ - --head $SOURCE_BRANCH \ - --title "$PR_TITLE" \ - --body "$PR_BODY" \ - --repo $TARGET_REPO - + TARGET_REPO="${{ secrets.TARGET_REPO_NAME }}" + TARGET_BRANCH="${{ secrets.TARGET_REPO_BRANCH }}" + SOURCE_BRANCH="${{ env.SOURCE_BRANCH_NAME }}" + + git checkout $SOURCE_BRANCH + git remote add target "https://$GH_TOKEN@github.com/$TARGET_REPO.git" + git push target $SOURCE_BRANCH:$SOURCE_BRANCH + + PR_TITLE="${{ github.event.pull_request.title }}" + PR_BODY="${{ github.event.pull_request.body }}" + + gh pr create \ + --base $TARGET_BRANCH \ + --head $SOURCE_BRANCH \ + --title "$PR_TITLE" \ + --body "$PR_BODY" \ + --repo $TARGET_REPO diff --git a/.github/workflows/Update_Docker_Images.yml b/.github/workflows/update-docker-images.yml similarity index 100% rename from .github/workflows/Update_Docker_Images.yml rename to .github/workflows/update-docker-images.yml