Skip to content

Commit 528f481

Browse files
committed
fix(chapel-ci): use find for comm-gasnet check (glob was too tight)
Run #5: build COMPLETED (libchpllaunch.a + libchplmalloc.a + modules all generated successfully), then the sanity glob missed the actual runtime path: No such file or directory: /opt/chapel-multilocale/lib/*/gnu/*/loc-flat/comm-gasnet/smp/*/launch-smp The real path includes an extra tasks-* component: lib/linux64/gnu/x86_64/loc-flat/comm-gasnet/smp/fast/tasks-qthreads/launch-smp/... Glob was missing the tasks-* slot between perf-flavor and launch-smp. Switch to find -name comm-gasnet -print -quit: hierarchy-independent, survives minor-version path renames, succeeds iff the gasnet runtime variant was built.
1 parent 78c07fe commit 528f481

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/chapel-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,11 +319,11 @@ jobs:
319319
source util/setchplenv.bash
320320
# Build chpl + runtime + GASNet+smp substrate
321321
make -j"$(nproc)"
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
322+
# Sanity: Chapel's runtime layout creates `comm-gasnet` directories
323+
# somewhere under $CHPL_HOME/lib for each (comm, launcher, tasks, ...)
324+
# variant. find -print -quit is format-independent and survives
325+
# path-component renames between Chapel minor versions.
326+
find "$CHPL_HOME/lib" -type d -name comm-gasnet -print -quit | grep -q comm-gasnet
327327
328328
- name: Activate multilocale Chapel
329329
id: activate
@@ -343,7 +343,7 @@ jobs:
343343
echo "PATH=$CHPL_HOME/bin/$(uname -s)-$(uname -m):$PATH"
344344
} >> "$GITHUB_ENV"
345345
chpl --version
346-
ls "$CHPL_HOME/lib"/*/gnu/*/loc-flat/comm-gasnet/smp/*/launch-smp 1>/dev/null
346+
find "$CHPL_HOME/lib" -type d -name comm-gasnet -print -quit | grep -q comm-gasnet
347347
348348
- name: Build mass-panic against multilocale Chapel
349349
working-directory: chapel

0 commit comments

Comments
 (0)