Skip to content

Commit 24572c4

Browse files
committed
Merge branch 'master' of github.com:swift-lang/swift-t
2 parents 6a1dae3 + 39c30f1 commit 24572c4

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

dev/jenkins/anaconda.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ do-activate()
249249
# Allow unset variables for:
250250
# activate_clang:16: CMAKE_PREFIX_PATH: parameter not set
251251
# Python 3.11 2025-04-25
252-
set +u
252+
set +eu
253253
source $PY/etc/profile.d/conda.sh
254254
conda activate base
255255
# conda env list
@@ -259,7 +259,7 @@ do-activate()
259259
log "CONDA UPDATING: $PY ..."
260260
conda update --quiet --yes --solver classic conda
261261
log "CONDA UPDATE: OK: $PY"
262-
set -u
262+
set -eu
263263
print
264264
}
265265

@@ -292,8 +292,9 @@ try-swift-t()
292292
log "TRY SWIFT/T..."
293293
PATH=$WORKSPACE/sfw/Miniconda-install/bin:$PATH
294294
() {
295-
# For set -x:
296-
PS4="+ "
295+
# For set -x (includes newline):
296+
PS4="
297+
+ "
297298
set -x
298299
which swift-t
299300
swift-t -v

0 commit comments

Comments
 (0)