fixed ci/discover-docker-matrix.sh for ci actions

Author: maureeungaro

.github/workflows/docker.yml

@@ -8,7 +8,7 @@ on:
   pull_request:            # PRs: build only (no push)
 
 concurrency:
-  group: ghcr-${{ github.ref }}   # cancel older runs on same ref
+  group: ghcr-${{ github.ref }}   # cancel older runs on the same ref
   cancel-in-progress: true
 
 jobs:
@@ -23,7 +23,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # Run the zsh discovery script which writes to $GITHUB_OUTPUT:
+      # Run the sh discovery script which writes to $GITHUB_OUTPUT:
       #   - matrix: JSON {"include":[{file,tag,os,latest},...]}
       #   - image : "ghcr.io/<owner>/gemc"
       - id: scan
@@ -39,7 +39,7 @@ jobs:
       packages: write    # needed to push to GHCR
     strategy:
       fail-fast: false
-      # Use the JSON produced by the discover job
+      # Use the JSON produced by ci/discover-docker-matrix.sh
       matrix: ${{ fromJSON(needs.discover.outputs.matrix) }}
     steps:
       - name: Checkout repository

ci/discover-docker-matrix.sh

@@ -1,73 +1,62 @@
 #!/usr/bin/env sh
-
 # Discover dockerfiles: dockerfiles/Dockerfile-gemc-<tag>-<os>
-# Outputs (for GitHub Actions):
-#   matrix: {"include":[{"file":..., "tag":..., "os":..., "latest":true|false}, ...]}
-#   image : ghcr.io/<owner>/gemc
+# Outputs for GitHub Actions:
+#   - matrix: {"include":[{"file":..., "tag":..., "os":..., "latest":true|false}, ...]}
+#   - image : ghcr.io/<owner>/gemc
 # Works on macOS (BSD utils), Linux, and GHA.
-# Example:
-# GITHUB_REPOSITORY_OWNER="gemc" ./ci/discover-docker-matrix.sh
 
 set -eu
 
 DIR="${1:-dockerfiles}"
 
-# Lowercase owner without bash-4 features
-OWNER="${GITHUB_REPOSITORY_OWNER:-unknown}"
+# Determine owner (prefer GITHUB_REPOSITORY_OWNER; fallback to GITHUB_REPOSITORY)
+OWNER="${GITHUB_REPOSITORY_OWNER:-}"
+if [ -z "$OWNER" ] && [ -n "${GITHUB_REPOSITORY:-}" ]; then
+  OWNER="${GITHUB_REPOSITORY%%/*}"
+fi
+[ -z "$OWNER" ] && OWNER="unknown"
 OWNER_LOWER=$(printf '%s' "$OWNER" | tr '[:upper:]' '[:lower:]')
 IMAGE="ghcr.io/$OWNER_LOWER/gemc"
 
-# Collect matches (handle spaces via NUL separators)
 TMP_TSV="$(mktemp)"
-FOUND=0
-# macOS/BSD find supports -print0; if not, fall back without it
-if find "$DIR" -type f -name 'Dockerfile-gemc-*' -print0 >/dev/null 2>&1; then
-  find "$DIR" -type f -name 'Dockerfile-gemc-*' -print0 \
-  | while IFS= read -r -d '' F; do
-      FOUND=$((FOUND+1)) # this won't persist outside subshell; we’ll recount later
-      BASE=$(basename "$F")                # Dockerfile-gemc-dev3-ubuntu24
-      REST=${BASE#Dockerfile-}             # gemc-dev3-ubuntu24
-      case "$REST" in
-        gemc-*-*) : ;;
-        *) continue ;;
-      esac
-      REST2=${REST#gemc-}                  # dev3-ubuntu24
-      TAG=${REST2%%-*}                     # dev3
-      OS=${REST2#*-}                       # ubuntu24 (may contain dashes)
-      # trailing number as weight (dev3 -> 3; dev -> 0)
-      DIGITS=$(printf '%s\n' "$TAG" | sed -n 's/.*\([0-9][0-9]*\)$/\1/p')
-      [ -z "$DIGITS" ] && DIGITS=0
-      printf '%s\t%s\t%s\t%s\n' "$F" "$TAG" "$OS" "$DIGITS" >> "$TMP_TSV"
-    done
-else
-  # Fallback (no -print0)
-  find "$DIR" -type f -name 'Dockerfile-gemc-*' \
-  | while IFS= read -r F; do
-      BASE=$(basename "$F")
-      REST=${BASE#Dockerfile-}
-      case "$REST" in
-        gemc-*-*) : ;;
-        *) continue ;;
-      esac
-      REST2=${REST#gemc-}
-      TAG=${REST2%%-*}
-      OS=${REST2#*-}
-      DIGITS=$(printf '%s\n' "$TAG" | sed -n 's/.*\([0-9][0-9]*\)$/\1/p')
-      [ -z "$DIGITS" ] && DIGITS=0
-      printf '%s\t%s\t%s\t%s\n' "$F" "$TAG" "$OS" "$DIGITS" >> "$TMP_TSV"
-    done
+
+# Glob-based enumeration (portable; avoids read -d / -print0)
+set -- "$DIR"/Dockerfile-gemc-*
+if [ "$1" = "$DIR/Dockerfile-gemc-*" ]; then
+  echo "No matching dockerfiles found under '$DIR' (expected Dockerfile-gemc-<tag>-<os>)." >&2
+  echo "[local] matrix={\"include\":[]}"
+  echo "[local] image=$IMAGE"
+  exit 1
 fi
 
+for F in "$@"; do
+  [ -f "$F" ] || continue
+  BASE=${F##*/}                 # Dockerfile-gemc-dev3-ubuntu24
+  REST=${BASE#Dockerfile-}      # gemc-dev3-ubuntu24
+  case "$REST" in
+    gemc-*-*) ;;
+    *) continue ;;
+  esac
+  REST2=${REST#gemc-}           # dev3-ubuntu24
+  TAG=${REST2%%-*}              # dev3
+  OS=${REST2#*-}                # ubuntu24 (may contain dashes)
+
+  # trailing digits in TAG as weight (dev3 -> 3; dev -> 0)
+  DIGITS=$(printf '%s\n' "$TAG" | sed -n 's/.*\([0-9][0-9]*\)$/\1/p')
+  [ -z "$DIGITS" ] && DIGITS=0
+
+  printf '%s\t%s\t%s\t%s\n' "$F" "$TAG" "$OS" "$DIGITS" >> "$TMP_TSV"
+done
+
 # If nothing was written, bail out clearly
 if [ ! -s "$TMP_TSV" ]; then
-  echo "No matching dockerfiles found under '$DIR' (expected Dockerfile-gemc-<tag>-<os>)." >&2
-  echo "Examples: Dockerfile-gemc-dev3-ubuntu24, Dockerfile-gemc-dev3-fedora40" >&2
+  echo "No usable dockerfiles after parsing." >&2
   echo "[local] matrix={\"include\":[]}"
   echo "[local] image=$IMAGE"
   exit 1
 fi
 
-# Build JSON with BSD/POSIX awk (no non-portable features)
+# Build JSON with POSIX/BSD awk
 JSON=$(
   awk -F '\t' '
     BEGIN { n=0 }