fixing pr workflow

shaneknapp · shaneknapp · commit 1c5706d3d2da · 2025-06-26T13:55:32.000-07:00
diff --git a/.github/workflows/build-push-create-pr.yaml b/.github/workflows/build-push-create-pr.yaml
@@ -45,7 +45,7 @@ jobs:
         id: build-and-push
         uses: jupyterhub/repo2docker-action@master
         with:
-          FORCE_REPO2DOCKER_VERSION: jupyter-repo2docker==2024.07.0
+          FORCE_REPO2DOCKER_VERSION: git+https://github.com/jupyterhub/repo2docker.git@e795060 # jupyter-repo2docker==2024.07.0
           DOCKER_REGISTRY: ${{ env.GOOGLE_ARTIFACT_REGISTRY }}
           IMAGE_NAME: ${{ env.IMAGE }}
           # Disable pushing a 'latest' tag, as this often just causes confusion
@@ -99,20 +99,23 @@ jobs:
             echo "Updated ${deployment} with new image tag ${new_hash}"
           done
 
-      - name: Check if any files were changed
+      - name: Check if any files were changed, create feature branch, add, commit, push changes and open a pull request
         if: ${{ env.IMAGE_TAG }}
-        run: echo "CHANGED_FILES=$(git status --porcelain -uno | awk '{print $2}')" >> $GITHUB_ENV
-
-      - name: Create feature branch, add, commit, push changes and open a pull request
-        if: ${{ env.CHANGED_FILES }}
         env:
           GH_TOKEN: ${{ secrets.IMAGE_BUILDER_CREATE_PR }}
         run: |
-          echo "Files changed: ${{ env.CHANGED_FILES }}"
+          git status --porcelain -uno | awk '{print $2}' > ${HOME}/CHANGED_FILES
+          if [ ! -s ${HOME}/CHANGED_FILES ]; then
+            echo "No files changed, skipping PR creation."
+            exit 0
+          fi
+
+          CHANGED_FILES=$(cat ${HOME}/CHANGED_FILES)
+          echo "Files changed: ${CHANGED_FILES}"
           git diff
           git checkout -b update-${HUB}-image-tag-${IMAGE_TAG}
           # to be safe, only add files that have changed
-          for file in $(echo -e ${{ env.CHANGED_FILES }}); do
+          for file in $(echo -e ${CHANGED_FILES}); do
             git add ${file}
           done
 
@@ -126,12 +129,8 @@ jobs:
           cat << EOF > ${HOME}/pr-body.txt
           ${MESSAGE}
 
-          ${{ env.CHANGED_FILES }}
+          ${CHANGED_FILES}
           EOF
           BODY=$(cat ${HOME}/pr-body.txt)
           gh pr new -t "${MESSAGE}" -b "${BODY}" -H${BRANCH} -Bstaging
 
-      - name: Print out a message if no PR is created
-        if: ${{ ! env.IMAGE_TAG }}
-        run: |
-          echo "Image not updated, no push to jupyterhub repo required"
