Skip to content

Commit af700a1

Browse files
committed
fix: git ops ordering in pi_release
1 parent 10d97bf commit af700a1

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/pi_release.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -49,33 +49,33 @@ jobs:
4949

5050
- name: Perform Edit/Git Operations
5151
run: |
52+
RELEASE_IMAGE="${{ env.DOCKERHUB_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ github.event.release.tag_name }}-${{ matrix.parent_image_type }}"
53+
BASE_REF="dev"
54+
HEAD_REF="parent-images"
55+
PR_TITLE="ci(pi): update to $RELEASE_IMAGE"
56+
5257
git branch -D "$HEAD_REF" || true
5358
git checkout -b "$HEAD_REF"
54-
59+
5560
bash cicd-deployment-scripts/pi/edit_dockerfile.sh \
5661
-i ${{ env.PARENT_IMAGE_NAME }} \
5762
-t ${{ matrix.parent_image_type }} \
5863
-l ${{ github.event.release.tag_name }} \
5964
-r ${{ env.DOCKERHUB_CONTAINER_REGISTRY }} \
6065
-d ${{ env.DOCKERFILE }}
6166
62-
LATEST_IMAGE_TAG="${{ env.DOCKERHUB_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ github.event.release.tag_name }}-${{ matrix.parent_image_type }}"
63-
BASE_REF="dev"
64-
HEAD_REF="parent-images"
65-
PR_TITLE="ci(pi): update to $LATEST_IMAGE_TAG"
66-
6767
git config user.email "[email protected]"
6868
git config user.name "GitHub Actions"
6969
7070
git add ${{ env.DOCKERFILE }}
7171
git commit -m "$PR_TITLE" || true
7272
git push --force origin "$HEAD_REF"
73-
echo "::notice::${{ matrix.app }} updated to $LATEST_IMAGE_TAG"
73+
echo "::notice::${{ matrix.app }} updated to $RELEASE_IMAGE"
7474
7575
bash cicd-deployment-scripts/pi/pr_create.sh \
7676
-b "$BASE_REF" \
7777
-h "$HEAD_REF" \
78-
-t "ci(pi): update to $LATEST_IMAGE_TAG" \
78+
-t "ci(pi): update to $RELEASE_IMAGE" \
7979
-o ${{ github.repository_owner }} \
8080
-r ${{ github.event.repository.name }} \
8181
-n ${{ github.event.release.tag_name }} \

0 commit comments

Comments
 (0)