Skip to content

Commit f23a91e

Browse files
brizentalbirdsarah
authored andcommitted
VPN-4018 - Do not get latest submodule version on Windows CI (#5784)
* Do not get latest submodule version on windows CI * Bring back remote update for i18n
1 parent 5669568 commit f23a91e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

taskcluster/scripts/build/windows.ps1

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ Remove-Item $FETCHES_PATH/VisualStudio/VC/Tools/MSVC/14.30.30705/bin/HostX64/x64
2121
# Fetch 3rdparty stuff.
2222
python3 -m pip install -r requirements.txt --user
2323
python3 -m pip install -r taskcluster/scripts/requirements.txt --user
24-
git submodule update --init --force --recursive --remote --depth=1
24+
git submodule update --init --force --recursive --depth=1
25+
git submodule update --remote i18n
2526

2627
# Fix: pip scripts are not on path by default on tc, so glean would fail
2728
$PYTHON_SCRIPTS =resolve-path "$env:APPDATA\Python\Python36\Scripts"
@@ -57,13 +58,13 @@ $BUILD_DIR =resolve-path "$TASK_WORKDIR/cmake_build"
5758

5859
cmake --version
5960
if ($env:MOZ_SCM_LEVEL -eq "3") {
60-
# Only on a release build we have access to those secrects.
61+
# Only on a release build we have access to those secrects.
6162
python3 ./taskcluster/scripts/get-secret.py -s project/mozillavpn/tokens -k sentry_dsn -f sentry_dsn
6263
python3 ./taskcluster/scripts/get-secret.py -s project/mozillavpn/tokens -k sentry_envelope_endpoint -f sentry_envelope_endpoint
6364
python3 ./taskcluster/scripts/get-secret.py -s project/mozillavpn/tokens -k sentry_debug_file_upload_key -f sentry_debug_file_upload_key
6465
$SENTRY_ENVELOPE_ENDPOINT = Get-Content sentry_envelope_endpoint
6566
$SENTRY_DSN = Get-Content sentry_dsn
66-
#
67+
#
6768
cmake -S . -B $BUILD_DIR -GNinja -DCMAKE_BUILD_TYPE=Release -DSENTRY_DSN="$SENTRY_DSN" -DSENTRY_ENVELOPE_ENDPOINT="$SENTRY_ENVELOPE_ENDPOINT"
6869
} else {
6970
# Do the generic build
@@ -85,9 +86,9 @@ Get-ChildItem -Path $TASK_WORKDIR/artifacts
8586

8687
if ($env:MOZ_SCM_LEVEL -eq "3") {
8788
sentry-cli-Windows-x86_64.exe login --auth-token $(Get-Content sentry_debug_file_upload_key)
88-
# This will ask sentry to scan all files in there and upload
89+
# This will ask sentry to scan all files in there and upload
8990
# missing debug info, for symbolification
90-
sentry-cli-Windows-x86_64.exe debug-files upload --org mozilla -p vpn-client $BUILD_DIR/src/CMakeFiles/mozillavpn.dir/vc140.pdb
91+
sentry-cli-Windows-x86_64.exe debug-files upload --org mozilla -p vpn-client $BUILD_DIR/src/CMakeFiles/mozillavpn.dir/vc140.pdb
9192
}
9293

9394
# mspdbsrv might be stil running after the build, so we need to kill it

0 commit comments

Comments
 (0)