Merge pull request #1019 from atheo89/unify-gha

Merge notebooks digest updater and runtimes updater ghas under one

Author: openshift-merge-bot[bot]

.github/workflows/notebooks-digest-updater.yaml

@@ -1,7 +1,7 @@
 ---
 # The aim of this GitHub workflow is to update the params.env and commit.env files
 # This GHA works for both orgs and it checks for the tags generated from the main branch.
-name: Update Notebook Images and Commits With New SHAs
+name: Update Notebook and Runtime Images as well as the Commits With New SHAs
 on:  # yamllint disable-line rule:truthy
   workflow_dispatch:
     inputs:
@@ -54,42 +54,60 @@ jobs:
           ref: ${{ env.TMP_BRANCH }}
           fetch-depth: 0
 
-      - name: Invoke script to handle the updates
+      - name: Invoke ci/sha-digest-updater.sh script to handle the updates
         shell: bash
         run: |
-          bash "${GITHUB_WORKSPACE}/ci/notebooks-digest-updater.sh" "${{ env.USER_HASH }}" "${{ env.REPO_ORG }}" "${{ env.BRANCH_NAME }}" "${{ env.REPO_NAME }}"
+          bash "${GITHUB_WORKSPACE}/ci/sha-digest-updater.sh" "${{ env.USER_HASH }}" "${{ env.REPO_ORG }}" "${{ env.BRANCH_NAME }}" "${{ env.REPO_NAME }}"
 
       - name: Commit Changes
         run: |
 
           if [[ $(git status --porcelain | wc -l) -gt 0 ]]; then
             git fetch origin ${{ env.TMP_BRANCH }} && \
             git pull origin ${{ env.TMP_BRANCH }} && \
-            git add "${GITHUB_WORKSPACE}/manifests/base/params.env" && \
-            git commit -m "Update images digest hashes via ${{ env.TMP_BRANCH }} GitHub action" && \
-            git add ""${GITHUB_WORKSPACE}/manifests/base/commit.env"" && \
-            git commit -m "Update image commits via ${{ env.TMP_BRANCH }} GitHub action" &&\
+            git add manifests/base/  && \
+            git commit -m "Update image related sha digests via notebooks-digest-updater GitHub action" && \
             git push origin ${{ env.TMP_BRANCH }}
           else
             echo "There were no changes detected in the images for the ${{ env.BRANCH_NAME }}"
           fi
 
+      - name: Capture skipped images log (if any)
+        id: skipped_log
+        run: |
+          if [[ -f ${GITHUB_WORKSPACE}/skipped-images.txt && -s ${GITHUB_WORKSPACE}/skipped-images.txt ]]; then
+            echo "Found skipped images. Preparing message."
+            echo 'log<<EOF' >> $GITHUB_OUTPUT
+            cat ${GITHUB_WORKSPACE}/skipped-images.txt >> $GITHUB_OUTPUT
+            echo 'EOF' >> $GITHUB_OUTPUT
+          else
+            echo "log=" >> $GITHUB_OUTPUT
+          fi
+
       - name: pull-request
         run: |
+
+            body="${PR_BODY}"
+
+            if [[ -n "${{ steps.skipped_log.outputs.log }}" ]]; then
+              body+="
+
+              :warning: The following images were skipped during update, please push them manually or retriger the GitHub action:
+              ${{ steps.skipped_log.outputs.log }}
+              "
+            fi
+
             gh pr create --repo https://github.com/$REPO_ORG/$REPO_NAME.git \
-              --title "$pr_title" \
-              --body "$pr_body" \
+              --title "$PR_TITLE" \
+              --body "$body" \
               --head $REPO_ORG:${{ env.TMP_BRANCH }} \
               --base ${{ env.BRANCH_NAME }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          pr_title: "[Notebooks Updater Action] Update Notebook Images and commit with new SHAs"
-          pr_body: |
+          PR_TITLE: "[Updater Action] Update Notebook and Runtime Images as well as the Commits With New SHAs"
+          PR_BODY: |
             :rocket: This is an automated Pull Request.
             Created by `/.github/workflows/notebooks-digest-updater.yaml`
-
-            This PR updates the following files:
             - `manifests/base/params.env` file with the latest updated SHA digests of the notebooks.
+            - `manifests/base/runtime-*.yamls` file with the latest updated SHA digests of the runtimes.
             - `manifests/base/commit.env` file with the latest commit.
-
-            :exclamation: **IMPORTANT NOTE**: Remember to delete the `${{ env.TMP_BRANCH }}` branch after merging the changes