Skip to content

Commit 15d4657

Browse files
authored
Merge branch 'main' into refactor/launcher
2 parents 3c0359b + 3a5732c commit 15d4657

35 files changed

+92
-30
lines changed

.ci/build_matrix.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ for version in "${versions[@]}"; do
101101
fi
102102

103103
# Skipping if on remote and on student
104-
if [[ "$ON_STUDENT" == "true" && "$ON_REMOTE" == "true" ]]; then
105-
echo "Skipping student versions when running on remote"
104+
if [[ "$ON_STUDENT" != "true" && "$ON_REMOTE" == "true" ]]; then
105+
echo "Skipping non-student versions when running on remote"
106106
echo ""
107107
continue
108108
fi

.ci/start_mapdl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ docker run \
5252
-u=0:0 \
5353
--memory=6656MB \
5454
--memory-swap=16896MB \
55-
"$MAPDL_IMAGE" "$EXEC_PATH" -grpc -dir /jobs -"$DISTRIBUTED_MODE" -np 2 > log.txt &
55+
"$MAPDL_IMAGE" "$EXEC_PATH" -grpc -dir /jobs -"$DISTRIBUTED_MODE" -np 2 -db -5000 -m -5000 - > log.txt &
5656

5757
grep -q 'Server listening on' <(timeout 60 tail -f log.txt)

doc/changelog.d/3643.added.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/3645.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/3646.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/3647.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/3657.maintenance.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/3659.maintenance.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/3662.fixed.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/3663.miscellaneous.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)