Skip to content

Commit b73e546

Browse files
authored
Fix: move submodule init from build scripts. (#899)
Fixes #898.
1 parent da97911 commit b73e546

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

.github/workflows/windows.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,11 @@ jobs:
217217
with:
218218
python-version: '3.11.4'
219219

220+
- name: Init CTS submodule
221+
if: matrix.options.tools_cts =='ON'
222+
run:
223+
git submodule update --init --recursive tests/cts
224+
220225
- name: Smudge embedded dates
221226
if: matrix.options.doc == 'ON'
222227
run: |

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,10 @@ before_script:
258258
./ci_scripts/before_build_macos.sh
259259
;;
260260
esac
261+
- |
262+
if [ "$FEATURE_TOOLS_CTS" = "ON" ]; then
263+
git submodule update --init --recursive tests/cts
264+
fi
261265
# Make sure embedded dates are correct.
262266
- ./install-gitconfig.sh
263267
- ci_scripts/smudge_date.sh

ci_scripts/build_linux.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ fi
7070

7171
mkdir -p $BUILD_DIR
7272

73-
if [ "$FEATURE_TOOLS_CTS" = "ON" ]; then
74-
git submodule update --init --recursive tests/cts
75-
fi
76-
7773
cmake_args=("-G" "$CMAKE_GEN"
7874
"-B" $BUILD_DIR \
7975
"-D" "CMAKE_BUILD_TYPE=$CONFIGURATION" \

ci_scripts/build_macos.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ else
6262
}
6363
fi
6464

65-
if [ "$FEATURE_TOOLS_CTS" = "ON" ]; then
66-
git submodule update --init --recursive tests/cts
67-
fi
68-
6965
cmake_args=("-G" "Xcode" \
7066
"-B" $BUILD_DIR \
7167
"-D" "CMAKE_OSX_ARCHITECTURES=$ARCHS" \

ci_scripts/build_win.ps1

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ if (($PACKAGE -eq "YES") -and ($FEATURE_TOOLS -eq "OFF")) {
8383
exit 2
8484
}
8585

86-
if (($FEATURE_TOOLS_CTS -eq "ON")) {
87-
git submodule update --init --recursive tests/cts
88-
}
89-
9086
$cmake_args = @(
9187
"-G", "$CMAKE_GEN"
9288
"-A", "$ARCH"

0 commit comments

Comments
 (0)