Merge branch 'main' into DGUK-290-move-markdown-render-to-docker-test

Author: Obsiye

.github/workflows/create-pr.yaml

@@ -18,10 +18,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: alphagov/datagovuk_find
-      - name: Create PR
+      - name: Update integration SHA
         run: bash ./docker/create-pr.sh
         env:
           GH_TOKEN: ${{ secrets.PR_GITHUB_TOKEN }}
           GH_REF: ${{ github.ref_name }}
           IS_TAG: "false"
           ENVS: "integration"
+          DIRECT_PUSH: "true"

docker/create-pr.sh

@@ -19,21 +19,27 @@ cd charts/charts/datagovuk/images
 
 for ENV in $(echo $ENVS | tr "," " "); do
   (
-    BRANCH="ci/${IMAGE_TAG}-${ENV}"
-
-    if git show-ref --quiet refs/heads/${BRANCH}; then
-      echo "Branch ${BRANCH} already exists on govuk-dgu-charts"
-    else
+    cd "${ENV}"
+    yq -i '.tag = env(IMAGE_TAG)' "find.yaml"
+    yq -i '.branch = env(SOURCE_BRANCH)' "find.yaml"
+    git add "find.yaml"
+
+    if [[ $(git status | grep "nothing to commit") ]]; then
+      echo "Nothing to commit"
+    elif [[ "${DIRECT_PUSH:-false}" == "true" ]]; then
+      BRANCH="ci/${IMAGE_TAG}-${ENV}"
       git checkout -b ${BRANCH}
+      git commit -m "Update datagovuk_find image tags for ${ENV} to ${IMAGE_TAG}"
+      git push --set-upstream origin "${BRANCH}"
+      PR_URL=$(gh pr create --title "Update datagovuk_find image tags for ${ENV} (${IMAGE_TAG})" --base main --head "${BRANCH}" --fill --repo alphagov/govuk-dgu-charts)
+      gh pr merge "${PR_URL}" --merge --delete-branch
+    else
+      BRANCH="ci/${IMAGE_TAG}-${ENV}"
 
-      cd "${ENV}"
-      yq -i '.tag = env(IMAGE_TAG)' "find.yaml"
-      yq -i '.branch = env(SOURCE_BRANCH)' "find.yaml"
-      git add "find.yaml"
-
-      if [[ $(git status | grep "nothing to commit") ]]; then
-        echo "Nothing to commit"
+      if git show-ref --quiet refs/heads/${BRANCH}; then
+        echo "Branch ${BRANCH} already exists on govuk-dgu-charts"
       else
+        git checkout -b ${BRANCH}
         git commit -m "Update datagovuk_find image tags for ${ENV} to ${IMAGE_TAG}"
         git push --set-upstream origin "${BRANCH}"
         gh pr create --title "Update datagovuk_find image tags for ${ENV} (${IMAGE_TAG})" --base main --head "${BRANCH}" --fill