diff --git a/.github/workflows/automerge_driver_main_to_dev_6_2_0.yml b/.github/workflows/automerge_driver_main_to_dev_6_2_0.yml index 95ececa..9b925db 100644 --- a/.github/workflows/automerge_driver_main_to_dev_6_2_0.yml +++ b/.github/workflows/automerge_driver_main_to_dev_6_2_0.yml @@ -23,13 +23,13 @@ jobs: - name: Ensure dev branch exists run: | - if git ls-remote --exit-code --heads origin dev-6.2.0-b.1; then + if git ls-remote --exit-code --heads origin dev-6.2.0-a.2; then echo "Branch exists on remote" - git fetch origin dev-6.2.0-b.1 - git checkout dev-6.2.0-b.1 + git fetch origin dev-6.2.0-a.2 + git checkout dev-6.2.0-a.2 else echo "Branch does not exist, creating it" - git checkout -b dev-6.2.0-b.1 + git checkout -b 6.2.0-a.2 fi - name: Force replace dev branch with main branch contents (including submodules) @@ -44,4 +44,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - git push https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git dev-6.2.0-b.1 --force + git push https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git dev-6.2.0-a.2 --force