Skip to content

Commit 78c07fe

Browse files
committed
fix(chapel-ci): verify multilocale via runtime dir, not printchplenv
Run #4 progressed past Build (Chapel 2.8.0 + bundled LLVM support compiled in ~12 min, libchpllaunch.a + modules + cmake module files all generated). Failed in Activate when: "$CHPL_HOME/util/printchplenv" --simple | grep -E '^CHPL_COMM=gasnet$' emitted zero output then exit 1 (presumably printchplenv --simple uses a different output format than KEY=value, or it ran into a chplenv caching issue). Switch to a format-independent check: Chapel's runtime layout names $CHPL_HOME/lib/<plat>/gnu/<arch>/loc-flat/comm-gasnet/smp/<tasks>/launch-smp/ per (comm, launcher, ...) variant. Existence of comm-gasnet/smp/.../launch-smp proves the runtime was built with our CHPL_COMM+CHPL_LAUNCHER settings — no chpl-flag-version dependence, no parsing format risk.
1 parent 87e0cc7 commit 78c07fe

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/chapel-ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,11 @@ jobs:
319319
source util/setchplenv.bash
320320
# Build chpl + runtime + GASNet+smp substrate
321321
make -j"$(nproc)"
322-
# Sanity: confirm we have a multilocale chpl. Chapel 2.8.0 dropped
323-
# `chpl --about`; use the canonical printchplenv utility instead.
324-
"$CHPL_HOME/util/printchplenv" --simple | grep -E '^CHPL_COMM=gasnet$'
322+
# Sanity: Chapel's runtime layout names a directory per (comm, launcher,
323+
# tasks, ...) variant. The presence of a `comm-gasnet` runtime lib
324+
# confirms the build picked up our CHPL_COMM=gasnet without depending
325+
# on `chpl --about` (gone in 2.8.0) or `printchplenv` output format.
326+
ls "$CHPL_HOME/lib"/*/gnu/*/loc-flat/comm-gasnet/smp/*/launch-smp 1>/dev/null
325327
326328
- name: Activate multilocale Chapel
327329
id: activate
@@ -341,7 +343,7 @@ jobs:
341343
echo "PATH=$CHPL_HOME/bin/$(uname -s)-$(uname -m):$PATH"
342344
} >> "$GITHUB_ENV"
343345
chpl --version
344-
"$CHPL_HOME/util/printchplenv" --simple | grep -E '^CHPL_COMM=gasnet$'
346+
ls "$CHPL_HOME/lib"/*/gnu/*/loc-flat/comm-gasnet/smp/*/launch-smp 1>/dev/null
345347
346348
- name: Build mass-panic against multilocale Chapel
347349
working-directory: chapel

0 commit comments

Comments
 (0)