fixes #70

Signed-off-by: Frederic BIDON <fredbi@yahoo.com>

Author: fredbi

.github/workflows/bump-release-monorepo.yml

@@ -198,9 +198,11 @@ jobs:
     steps:
       -
         name: Checkout repository
+        if: ${{ needs.prepare-modules.outputs.pull-request-operation != 'none' }}  # skip if no pull request to be waited
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       -
         name: Wait for PR to be merged
+        if: ${{ needs.prepare-modules.outputs.pull-request-operation != 'none' }}  # skip if no pull request to be waited
         run: |
           echo "::notice title=waiting-for-merge::Waiting for PR ${PR_URL} to be merged"
 
@@ -227,6 +229,15 @@ jobs:
 
           echo "::error title=timeout::Timed out waiting for PR to be merged after ${MAX_WAIT}s"
           exit 1
+      -
+        name: Report status
+        run: |
+          echo "::notice title=waiting-for-merge::Waiting for PR ${PR_URL} to be merged"
+          if [[ "${{ needs.prepare-modules.outputs.pull-request-operation }}" == "none" ]] ; then
+            echo "::notice title=wait-for-pr::no pull request expected. Skipped waiting."
+          else
+            echo "::notice title=wait-for-pr::pull request merged. Can proceed with the tagging and release"
+          fi
 
   tag-release-monorepo:
     name: Tag release [mono-repo]
@@ -282,6 +293,8 @@ jobs:
           MODULE_RELATIVE_NAMES: ${{ needs.detect-modules.outputs.bash-relative-names }}
           GITHUB_REPO: ${{ github.repository }}
         run: |
+          set -x
+
           # Tag all modules similar to hack/tag_modules.sh
           # Note: The PR with updated go.mod files has been merged at this point
           root="$(git rev-parse --show-toplevel)"
@@ -307,7 +320,7 @@ jobs:
           declare -a ALL_RELATIVE_MODULES
           mapfile -d' ' -t ALL_RELATIVE_MODULES < <(printf "%s" "${MODULE_RELATIVE_NAMES}")
           for module_relative_name in "${ALL_RELATIVE_MODULES[@]}"; do
-            module_relative_name=${module_relative_name#"${GITHUB_REPO}"}
+            module_relative_name=${module_relative_name#"${GITHUB_REPO}"} # in some case, the module is not prefixed by the root module, e.g. "v2" modules.
             if [[ -z "${module_relative_name}" || "${module_relative_name}" == "{root}" ]] ; then
               module_tag="${NEXT_TAG}" # e.g. "v0.24.0"
             else

.github/workflows/contributors.yml

@@ -65,6 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       pull-request-url: ${{ steps.create-pull-request.outputs.pull-request-url }}
+      pull-request-operation: ${{ steps.create-pull-request.outputs.pull-request-operation }}
     steps:
       -
         name: Checkout repository
@@ -116,6 +117,18 @@ jobs:
           sign-commits: ${{ inputs.enable-commit-signing }}
           signoff: true # DCO
 
+  no-change:
+    needs: [update-contributors]
+    runs-on: ubuntu-latest
+    if: ${{ needs.update-contributors.outputs.pull-request-operation  == 'none' }}
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Report no change needed
+        run: |
+          echo "::notice title=no-change::No change needed to the contributors file"
+          exit 0
+
   auto-merge:
     # description: |
     #   Approves the PR, waits for all jobs (including non-required ones), and enables auto-merge.
@@ -129,6 +142,7 @@ jobs:
       contents: write
       pull-requests: write
     runs-on: ubuntu-latest
+    if: ${{ needs.update-contributors.outputs.pull-request-operation  != 'none' }}
     env:
       PR_URL: ${{ needs.update-contributors.outputs.pull-request-url }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/prepare-release-monorepo.yml

@@ -23,6 +23,9 @@ on:
       pull-request-url:
         description: "URL of the created pull request"
         value: ${{ jobs.prepare-modules.outputs.pull-request-url }}
+      pull-request-operation:
+        description: "Pull request operation"
+        value: ${{ jobs.prepare-modules.outputs.pull-request-operation }}
     inputs:
       target-tag:
         description: |
@@ -90,6 +93,7 @@ jobs:
       pull-requests: write
     outputs:
       pull-request-url: ${{ steps.create-pull-request.outputs.pull-request-url }}
+      pull-request-operation: ${{ steps.create-pull-request.outputs.pull-request-operation }}
     steps:
       -
         name: Checkout repository
@@ -136,10 +140,12 @@ jobs:
           for dir in "${ALL_FOLDERS[@]}"; do
             echo "::notice title=processing-module::Processing module in ${dir}"
             pushd "${dir}" > /dev/null
+
             echo "Original go.mod"
             cat go.mod
 
-            go mod download -x
+            # Make sure we can get all dependencies
+            go mod download
 
             # List dependencies and update those matching the root module or sub-modules
             # This matches both the root module and any sub-modules under the same path.
@@ -155,6 +161,7 @@ jobs:
               sort -u | \
               grep "^${root_module}" | \
               grep -v "^${current_module}$" || true )
+
             echo "Transformed go.mod"
             cat go.mod
 
@@ -171,7 +178,7 @@ jobs:
             go work sync
           fi
 
-          # Show what changed
+          # Show what has changed
           echo "::notice title=changes::Git status after updates"
           git status --short
       -
@@ -218,6 +225,18 @@ jobs:
           sign-commits: ${{ inputs.enable-commit-signing }}
           signoff: true # DCO
 
+  no-change:
+    needs: [prepare-modules]
+    runs-on: ubuntu-latest
+    if: ${{ needs.update-contributors.outputs.pull-request-operation  == 'none' }}
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Report no change needed
+        run: |
+          echo "::notice title=no-change::No change needed to the go.mod files"
+          exit 0
+
   auto-merge:
     # description: |
     #   Approves the PR, waits for all jobs (including non-required ones), and enables auto-merge.
@@ -234,6 +253,7 @@ jobs:
       contents: write
       pull-requests: write
     runs-on: ubuntu-latest
+    if: ${{ needs.prepare-modules.outputs.pull-request-operation  != 'none' }}
     env:
       PR_URL: ${{ needs.prepare-modules.outputs.pull-request-url }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}