From f32c1eef380e6830e44e6d85e9a0115be7ee7ef5 Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Wed, 3 Mar 2021 17:14:29 +0100 Subject: [PATCH] CI: Omit online tests Tests that require an active internet connection will now be omitted on CI as they recently caused a bunch of CI jobs to fail just because some external server was unreachable. --- .ci/azure-pipelines/build_linux.bash | 2 +- .ci/azure-pipelines/build_macos.bash | 2 +- .ci/azure-pipelines/build_windows.bat | 2 +- .github/workflows/build.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/azure-pipelines/build_linux.bash b/.ci/azure-pipelines/build_linux.bash index b2a2a9cc4..7027cd583 100755 --- a/.ci/azure-pipelines/build_linux.bash +++ b/.ci/azure-pipelines/build_linux.bash @@ -32,7 +32,7 @@ cd $BUILD_BINARIESDIRECTORY cmake -G Ninja -DCMAKE_INSTALL_PREFIX=appdir/usr \ -DCMAKE_BUILD_TYPE=Release -DRELEASE_ID=$RELEASE_ID -DBUILD_NUMBER=$BUILD_NUMBER \ - -Dtests=ON -Donline-tests=ON -Dsymbols=ON -Dgrpc=ON \ + -Dtests=ON -Dsymbols=ON -Dgrpc=ON \ -Ddisplay-install-paths=ON $BUILD_SOURCESDIRECTORY cmake --build . diff --git a/.ci/azure-pipelines/build_macos.bash b/.ci/azure-pipelines/build_macos.bash index 92366a2c4..ca7e5f9e1 100755 --- a/.ci/azure-pipelines/build_macos.bash +++ b/.ci/azure-pipelines/build_macos.bash @@ -43,7 +43,7 @@ cd $BUILD_BINARIESDIRECTORY cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=$MUMBLE_ENVIRONMENT_TOOLCHAIN -DIce_HOME="$MUMBLE_ENVIRONMENT_PATH/installed/x64-osx" \ -DCMAKE_BUILD_TYPE=Release -DRELEASE_ID=$RELEASE_ID -DBUILD_NUMBER=$BUILD_NUMBER \ - -Dtests=ON -Donline-tests=ON -Dstatic=ON -Dsymbols=ON -Dgrpc=ON \ + -Dtests=ON -Dstatic=ON -Dsymbols=ON -Dgrpc=ON \ -Ddisplay-install-paths=ON $BUILD_SOURCESDIRECTORY cmake --build . diff --git a/.ci/azure-pipelines/build_windows.bat b/.ci/azure-pipelines/build_windows.bat index 62efc3356..533228c83 100644 --- a/.ci/azure-pipelines/build_windows.bat +++ b/.ci/azure-pipelines/build_windows.bat @@ -69,7 +69,7 @@ del C:\Strawberry\c\bin\c++.exe cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="%MUMBLE_ENVIRONMENT_TOOLCHAIN%" -DVCPKG_TARGET_TRIPLET=%MUMBLE_ENVIRONMENT_TRIPLET% ^ -DIce_HOME="%MUMBLE_ENVIRONMENT_PATH%\installed\%MUMBLE_ENVIRONMENT_TRIPLET%" ^ -DCMAKE_BUILD_TYPE=Release -DRELEASE_ID=%RELEASE_ID% -DBUILD_NUMBER=%BUILD_NUMBER% ^ - -Dpackaging=ON -Dtests=ON -Donline-tests=ON -Dstatic=ON -Dsymbols=ON -Dgrpc=ON -Dasio=ON -Dg15=ON ^ + -Dpackaging=ON -Dtests=ON -Dstatic=ON -Dsymbols=ON -Dgrpc=ON -Dasio=ON -Dg15=ON ^ -Ddisplay-install-paths=ON "%BUILD_SOURCESDIRECTORY%" if errorlevel 1 ( diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bff472f36..b2545552c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release CMAKE_OPTIONS: | - -Dtests=ON -Donline-tests=ON -Dsymbols=ON -Dgrpc=ON -Ddisplay-install-paths=ON + -Dtests=ON -Dsymbols=ON -Dgrpc=ON -Ddisplay-install-paths=ON MUMBLE_ENVIRONMENT_SOURCE: 'https://dl.mumble.info/build/vcpkg/'