Skip to content

Commit 8ef891e

Browse files
committed
fix: update edit script
1 parent 21e74c5 commit 8ef891e

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

.github/workflows/k8s_edit.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
token: ${{ secrets.GH_TOKEN }}
3131
repository: ${{ github.repository_owner }}/${{ env.KUBERNETES_CLUSTER_REPO_NAME }}
3232
ref: refs/heads/dev
33-
fetch-depth: 0
3433

3534
- name: GitHub Configuration
3635
run: git config --global url."https://oauth2:${{ secrets.GH_TOKEN }}@github.com".insteadOf https://github.com
@@ -44,16 +43,9 @@ jobs:
4443
AUTOMATED_RELEASE_BRANCH="automated-release-${{ github.event_name == 'release' && 'prod' || 'dev' }}"
4544
KUBERNETES_POD_NEW_IMAGE="${{ env.AZURE_CONTAINER_REGISTRY }}/${{ github.event.repository.name }}"
4645
47-
git fetch origin
4846
AUTOMATED_RELEASE_BRANCH_EXISTS=$(git rev-parse --verify refs/heads/$AUTOMATED_RELEASE_BRANCH 2>/dev/null || true)
49-
if [ -n "$AUTOMATED_RELEASE_BRANCH_EXISTS" ]; then
50-
echo "Branch $AUTOMATED_RELEASE_BRANCH already exists"
51-
git checkout $AUTOMATED_RELEASE_BRANCH
52-
git pull origin $AUTOMATED_RELEASE_BRANCH
53-
else
54-
echo "Creating branch $AUTOMATED_RELEASE_BRANCH off ${{ env.KUBERNETES_CLUSTER_REPO_NAME }}@$(git log -1 --format='%H')"
55-
git checkout -b $AUTOMATED_RELEASE_BRANCH
56-
fi
47+
git checkout $AUTOMATED_RELEASE_BRANCH || git checkout -b $AUTOMATED_RELEASE_BRANCH
48+
git push origin $AUTOMATED_RELEASE_BRANCH && git pull origin $AUTOMATED_RELEASE_BRANCH
5749
5850
# git checkout $AUTOMATED_RELEASE_BRANCH || git checkout -b $AUTOMATED_RELEASE_BRANCH
5951

0 commit comments

Comments
 (0)