diff options
author | Robert Adam <dev@robert-adam.de> | 2021-03-03 21:00:21 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-03 21:00:21 +0300 |
commit | 761294be182f9f707a2cdee7ac672f76148d23e4 (patch) | |
tree | b98efaf7af4077f1cb4aa3bd6daef0d09088f1d9 | |
parent | 19a9ce8106544209c26f99ca55929ce396d48479 (diff) | |
parent | d0e59c6bfe3d11a13aa0e603d6234745c16e6d99 (diff) |
Merge pull request #4821: 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.
-rwxr-xr-x | .ci/azure-pipelines/build_linux.bash | 2 | ||||
-rwxr-xr-x | .ci/azure-pipelines/build_macos.bash | 2 | ||||
-rw-r--r-- | .ci/azure-pipelines/build_windows.bat | 2 | ||||
-rwxr-xr-x | .ci/travis-ci/before_install.bash | 64 | ||||
-rwxr-xr-x | .ci/travis-ci/script.bash | 56 | ||||
-rw-r--r-- | .github/workflows/build.yml | 2 |
6 files changed, 4 insertions, 124 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/.ci/travis-ci/before_install.bash b/.ci/travis-ci/before_install.bash deleted file mode 100755 index 0a48c798b..000000000 --- a/.ci/travis-ci/before_install.bash +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -ex -# -# Copyright 2017-2021 The Mumble Developers. All rights reserved. -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file at the root of the -# Mumble source tree or at <https://www.mumble.info/LICENSE>. - -MUMBLE_HOST_DEB=${MUMBLE_HOST/_/-} - -if [ "${TRAVIS_OS_NAME}" == "linux" ]; then - if [ "${MUMBLE_HOST}" == "aarch64-linux-gnu" ] || [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then - sudo apt-get -qq update - sudo apt-get -y install build-essential ninja-build pkg-config \ - qt5-default qttools5-dev qttools5-dev-tools libqt5svg5-dev \ - libboost-dev libssl-dev libprotobuf-dev protobuf-compiler libprotoc-dev \ - libcap-dev libxi-dev \ - libasound2-dev \ - libogg-dev libsndfile1-dev libspeechd-dev \ - libavahi-compat-libdnssd-dev libzeroc-ice-dev libgrpc++-dev protobuf-compiler-grpc - if [ "${MUMBLE_HOST}" == "aarch64-linux-gnu" ]; then - # Kitware's APT repository doesn't provide packages for ARM64. - cd ${HOME} - if [ -d "cmake-3.17.2" ] && [ "$(ls -A cmake-3.17.2)" ]; then - # Directory cached, CMake has already been compiled in a previous build. - cd cmake-3.17.2 && sudo make install - else - # Build a recent version of CMake. - wget https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2.tar.gz && tar -xzvf cmake-3.17.2.tar.gz && cd cmake-3.17.2 - ./bootstrap && make -j $(nproc) && sudo make install - fi - else - sudo apt-get -y install g++-multilib - fi - elif [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ] || [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then - sudo dpkg --add-architecture i386 - - sudo apt-get -qq update - sudo apt-get -y install ninja-build wine32-development wine-development - - mkdir ${HOME}/mxe && cd ${HOME}/mxe - - # Download lists of MXE packages to install. - wget https://dl.mumble.info/build/mxe/mxe.deb-list - wget https://dl.mumble.info/build/mxe/mxe-x86-64-pc-linux-gnu.deb-list - wget https://dl.mumble.info/build/mxe/mxe-${MUMBLE_HOST_DEB}.static.deb-list - - # Merge the lists into a single one. - cat *.deb-list > packages.deb-list - - # Download the MXE packages, if not cached. - while read package; do - if [ ! -z "$package" ] && [ ! -f "$package" ]; then - wget https://dl.mumble.info/build/mxe/$package - fi - done <packages.deb-list - - # Install the MXE packages. - sudo dpkg -i *.deb - else - exit 1 - fi -else - exit 1 -fi diff --git a/.ci/travis-ci/script.bash b/.ci/travis-ci/script.bash deleted file mode 100755 index 66efc716a..000000000 --- a/.ci/travis-ci/script.bash +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -ex -# -# Copyright 2017-2021 The Mumble Developers. All rights reserved. -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file at the root of the -# Mumble source tree or at <https://www.mumble.info/LICENSE>. - -if [ "${TRAVIS_REPO_SLUG}" == "mumble-voip/mumble" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then - if [ "${TRAVIS_BRANCH}" == "master" ]; then - MASTER_BRANCH=1 - fi -fi - -RELEASE_ID=$(python scripts/mumble-version.py) - -if [ "${TRAVIS_OS_NAME}" == "linux" ]; then - if [ "${MUMBLE_HOST}" == "aarch64-linux-gnu" ]; then - mkdir build && cd build - - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -Dtests=ON -DRELEASE_ID=$RELEASE_ID -Dsymbols=ON -Donline-tests=ON -Dgrpc=ON -Ddisplay-install-paths=ON .. - - cmake --build . - # We don't execute tests on ARM64 because TestPacketDataStream fails. - # See https://github.com/mumble-voip/mumble/issues/3845. - #ctest - sudo cmake --install . - elif [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then - mkdir build && cd build - - # We specify the absolute path because otherwise Travis CI's CMake is used. - /usr/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -Dtests=ON -DRELEASE_ID=$RELEASE_ID -Dsymbols=ON -Donline-tests=ON -Dgrpc=ON \ - -Ddisplay-install-paths=ON .. - - /usr/bin/cmake --build . - /usr/bin/ctest --verbose - sudo /usr/bin/cmake --install . - elif [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ] || [ "${MUMBLE_HOST}" == "x86_64-w64-mingw32" ]; then - wget https://dl.mumble.info/build/extra/asio_sdk.zip -P /tmp/ - unzip /tmp/asio_sdk.zip - mv asiosdk_2.3.3_2019-06-14 3rdparty/asio - - mkdir build && cd build - - PATH=$PATH:/usr/lib/mxe/usr/bin - - ${MUMBLE_HOST}.static-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -Dtests=ON -DRELEASE_ID=$RELEASE_ID -Dstatic=ON -Dsymbols=ON -Dasio=ON \ - -Dzeroconf=OFF -Dice=OFF -Doverlay=OFF -Donline-tests=ON -Ddisplay-install-paths=ON .. - cmake --build . - # TODO: investigate why tests fail. - #ctest - else - exit 1 - fi -else - exit 1 -fi 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/' |