From 89053a1b9db23733fcba4d24883acef9ba2df36c Mon Sep 17 00:00:00 2001
From: Domenico Sibilio <domenicosibilio@gmail.com>
Date: Mon, 14 Sep 2026 12:27:38 +0200
Subject: [PATCH] AAE-51793 Widen npm-check-bundle retry window and fix set -e
 short circuit (#12233)

---
 .github/actions/npm-check-bundle/action.yml | 10 ++++++----
 .github/workflows/release.yml               |  2 +-
 scripts/github/build/npm-check-bundles.sh   |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/actions/npm-check-bundle/action.yml b/.github/actions/npm-check-bundle/action.yml
index 546e7b2565..1027711f83 100644
--- a/.github/actions/npm-check-bundle/action.yml
+++ b/.github/actions/npm-check-bundle/action.yml
@@ -28,14 +28,16 @@ runs:
         fi
 
         # Retry to absorb npm registry propagation delay right after publish.
-        NPM_VIEW_RETRIES=6
-        NPM_VIEW_RETRY_DELAY=10
+        NPM_VIEW_RETRIES=24
+        NPM_VIEW_RETRY_DELAY=20
         for attempt in $(seq 1 "$NPM_VIEW_RETRIES"); do
-          ADF_VERSION=$(npm view @alfresco/adf-core@${TAG_NPM} version 2>/dev/null)
+          ADF_VERSION=$(npm view @alfresco/adf-core@${TAG_NPM} version 2>/dev/null) || true
           if [[ -n $ADF_VERSION ]]; then
             break
           fi
-          sleep "$NPM_VIEW_RETRY_DELAY"
+          if [[ $attempt -lt $NPM_VIEW_RETRIES ]]; then
+            sleep "$NPM_VIEW_RETRY_DELAY"
+          fi
         done
 
         if [[ -z $ADF_VERSION ]]; then
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a5afc3eae1..a9d6100741 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -125,7 +125,7 @@ jobs:
 
   npm-check-bundle:
     needs: [release-npm]
-    timeout-minutes: 15
+    timeout-minutes: 25
     if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps:
diff --git a/scripts/github/build/npm-check-bundles.sh b/scripts/github/build/npm-check-bundles.sh
index b822968dcf..9224ac86f2 100755
--- a/scripts/github/build/npm-check-bundles.sh
+++ b/scripts/github/build/npm-check-bundles.sh
@@ -35,8 +35,8 @@ error_out() {
 }
 
 # Retry to absorb npm registry propagation delay right after publish.
-NPM_VIEW_RETRIES=6
-NPM_VIEW_RETRY_DELAY=10
+NPM_VIEW_RETRIES=24
+NPM_VIEW_RETRY_DELAY=20
 
 npm_view_version() {
     local spec=$1