diff --git a/.github/workflows/create-sync-pr.yml b/.github/workflows/sync-repo-pr.yml similarity index 97% rename from .github/workflows/create-sync-pr.yml rename to .github/workflows/sync-repo-pr.yml index 46f6365fd..726cbbfc8 100644 --- a/.github/workflows/create-sync-pr.yml +++ b/.github/workflows/sync-repo-pr.yml @@ -10,12 +10,11 @@ env: CURRENT_BRANCH: ${{ github.ref_name }} TARGET_BRANCH: ${{ vars.SYNC_TARGET_BRANCH_NAME }} # The target branch that you would like to merge changes like develop GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} # Personal access token required to modify contents and workflows - REVIEWER: ${{ vars.SYNC_PR_REVIEWER }} ACCOUNT_USER_NAME: ${{ vars.ACCOUNT_USER_NAME }} ACCOUNT_USER_EMAIL: ${{ vars.ACCOUNT_USER_EMAIL }} jobs: - Create_PR: + create_pull_request: runs-on: ubuntu-latest permissions: pull-requests: write diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/sync-repo.yml similarity index 94% rename from .github/workflows/repo-sync.yml rename to .github/workflows/sync-repo.yml index 2c211cf31..9ac4771ef 100644 --- a/.github/workflows/repo-sync.yml +++ b/.github/workflows/sync-repo.yml @@ -35,9 +35,8 @@ jobs: env: GH_TOKEN: ${{ secrets.ACCESS_TOKEN }} run: | - RUN_ID="${{ github.run_id }}" TARGET_REPO="${{ vars.SYNC_TARGET_REPO }}" - TARGET_BRANCH="sync/${RUN_ID}" + TARGET_BRANCH="${{ vars.SYNC_TARGET_BRANCH_NAME }}" SOURCE_BRANCH="${{ env.SOURCE_BRANCH_NAME }}" git checkout $SOURCE_BRANCH