Skip to content

Commit 3e535d9

Browse files
committed
Try to disambiguate ambiguous refs
1 parent 63fd977 commit 3e535d9

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/sync-repo-prod.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ jobs:
2525
with:
2626
ref: prod
2727

28-
- name: Add remote branch ${{ env.REPO }}:deploy
28+
- name: Add remote repo ${{ env.REPO }}
2929
run: |
3030
mkdir -p "$HOME/.ssh"
3131
echo "${{ secrets.SSH_DEPLOY_KEY }}" > "$HOME/.ssh/deploy_key"
3232
chmod 600 "$HOME/.ssh/deploy_key"
3333
3434
export GIT_SSH_COMMAND="ssh -i $HOME/.ssh/deploy_key"
35-
git remote add prod git@github.com:${{ env.REPO }}.git
35+
git remote add prod-repo git@github.com:${{ env.REPO }}.git
3636
git fetch --all
3737
3838
- name: Fast-forward deployment branch
3939
run: |
40-
git checkout -b deploy/prod --track prod/deploy
40+
git checkout -b deploy --track prod-repo/deploy
4141
git merge --ff-only prod
4242
4343
- name: Push to remote repo

.github/workflows/sync-repo-staging.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ jobs:
2525
with:
2626
ref: staging
2727

28-
- name: Add remote branch ${{ env.REPO }}:deploy
28+
- name: Add remote repo ${{ env.REPO }}
2929
run: |
3030
mkdir -p "$HOME/.ssh"
3131
echo "${{ secrets.SSH_DEPLOY_KEY }}" > "$HOME/.ssh/deploy_key"
3232
chmod 600 "$HOME/.ssh/deploy_key"
3333
3434
export GIT_SSH_COMMAND="ssh -i $HOME/.ssh/deploy_key"
35-
git remote add staging git@github.com:${{ env.REPO }}.git
35+
git remote add staging-repo git@github.com:${{ env.REPO }}.git
3636
git fetch --all
3737
3838
- name: Fast-forward deployment branch
3939
run: |
40-
git checkout -b deploy/staging --track staging/deploy
40+
git checkout -b deploy --track staging-repo/deploy
4141
git merge --ff-only staging
4242
4343
- name: Push to remote repo

0 commit comments

Comments
 (0)