From 6608dd0b8df6bf3b344caecf919315e6bc0824c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Tue, 24 Dec 2019 05:33:12 -0500 Subject: [PATCH] Fix disabling crashpad and disable using crashpad on win32 Thanks Rye! The Win32 build is a mess and won't have crash support for this release We'll fix this all later --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7162ed78d..44cbbb60f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ variables: } - pipenv run autobuild configure -c Release -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON - pipenv run autobuild build -c Release --no-configure - - If ($env:VIEWER_USE_CRASHPAD) { + - If ($env:VIEWER_USE_CRASHPAD -eq 'TRUE') { - Push-Location .\build-vc-*\newview\Release\ - sentry-cli upload-dif --include-sources singularity-bin.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1.dll libcrypto-1_1.pdb libssl-1_1.dll libssl-1_1.pdb libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll libhunspell.dll libhunspell.pdb glod.dll - Pop-Location } @@ -70,6 +70,7 @@ build:project:windows32: variables: AUTOBUILD_ADDRSIZE: 32 VIEWER_CHANNEL_TYPE: Project + VIEWER_USE_CRASHPAD: "FALSE" only: - /^project-.*$/ @@ -87,6 +88,7 @@ build:beta:windows32: variables: AUTOBUILD_ADDRSIZE: 32 VIEWER_CHANNEL_TYPE: Beta + VIEWER_USE_CRASHPAD: "FALSE" <<: *beta_rules build:beta:windows64: @@ -101,6 +103,7 @@ build:release:windows32: variables: AUTOBUILD_ADDRSIZE: 32 VIEWER_CHANNEL_TYPE: Release + VIEWER_USE_CRASHPAD: "FALSE" <<: *release_rules build:release:windows64: