Skip to content

Commit 6b6c992

Browse files
committed
Remove the --mods from build matrix param and add it to test invocation
1 parent 181d174 commit 6b6c992

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/workflows/matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
pch: 1
108108
archive-success: basic-build
109109
dont_skip_data_only_changes: 1
110-
mods: --mods=magiclysm|xedra_evolved
110+
mods: magiclysm|xedra_evolved
111111
title: Basic Build and Test (Clang oldest supported, Ubuntu, Curses)
112112
ccache_limit: 4.5G
113113
ccache_key: linux-llvm-13

build-scripts/gha_test_only.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ else
5757
export UBSAN_OPTIONS=print_stacktrace=1
5858
parallel -j "$num_test_jobs" ${parallel_opts} "run_test './tests/cata_test' '('{}')=> ' --user-dir=test_user_dir_{#} {}" ::: "[slow] ~starting_items" "~[slow] ~[.],starting_items"
5959
if [ -n "$MODS" ]
60-
MODLIST=${MODS#--mods=}
6160
then
62-
for MODSET in ${MODLIST//|/ }; do
61+
for MODSET in ${MODS//|/ }; do
6362
parallel -j "$num_test_jobs" ${parallel_opts} "run_test './tests/cata_test' 'Mods-('{}')=> ' --mods=$(printf %q "${MODSET}") --user-dir=modded_{#} {}" ::: "[slow] ~starting_items" "~[slow] ~[.],starting_items"
6463
done
6564
fi

0 commit comments

Comments
 (0)