Skip to content

Commit

Permalink
Merge PR #3846: Travis CI: transform Linux x86_64 build into ARM64
Browse files Browse the repository at this point in the history
  • Loading branch information
davidebeatrici authored Oct 13, 2019
2 parents bafcf47 + 8cf4a9c commit c0f50d1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ cache:
matrix:
include:
- os: linux
arch: arm64
dist: xenial
env: MUMBLE_HOST=x86_64-linux-gnu
env: MUMBLE_HOST=aarch64-linux-gnu
- os: linux
dist: xenial
env: MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1
Expand Down
8 changes: 8 additions & 0 deletions scripts/travis-ci/before_install.bash
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
sudo apt-get build-dep -qq mumble
sudo apt-get install libqt5sql5 libqt5sql5-sqlite qt5-default qttools5-dev qttools5-dev-tools qtbase5-dev qtbase5-dev-tools qttranslations5-l10n libqt5svg5-dev
sudo apt-get install libjack-jackd2-dev
elif [ "${MUMBLE_HOST}" == "aarch64-linux-gnu" ]; then
sudo apt-get -qq update
sudo apt-get -y install build-essential pkg-config qt5-default qttools5-dev-tools libqt5svg5-dev \
libboost-dev libssl-dev libprotobuf-dev protobuf-compiler \
libcap-dev libxi-dev \
libjack-jackd2-dev libasound2-dev libpulse-dev \
libogg-dev libsndfile1-dev libspeechd-dev \
libavahi-compat-libdnssd-dev libzeroc-ice-dev libg15daemon-client-dev
elif [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then
sudo dpkg --add-architecture i386
sudo apt-get -qq update
Expand Down
5 changes: 4 additions & 1 deletion scripts/travis-ci/script.bash
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}"
fi
qmake CONFIG+="release tests g15-emulator ${EXTRA_CONFIG}" DEFINES+="MUMBLE_VERSION=${TRAVIS_COMMIT:0:7}" -recursive
if [ "${MUMBLE_NO_PCH}" == "1" ] && [ "${MASTER_BRANCH}" = "1" ]; then
if [ "${MASTER_BRANCH}" = "1" ]; then
# Wraps the compilation with the Build Wrapper to generate the configuration used later by the SonarQube Scanner.
mkdir build
build-wrapper-linux-x86-64 --out-dir build/sonar make -j 2
Expand All @@ -29,6 +29,9 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
else
make -j2 && make check
fi
elif [ "${MUMBLE_HOST}" == "aarch64-linux-gnu" ]; then
qmake CONFIG+="release tests warnings-as-errors ${EXTRA_CONFIG}" -recursive
make -j $(nproc)
elif [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then
wget http://www.steinberg.net/sdk_downloads/asiosdk2.3.zip -P ../
unzip ../asiosdk2.3.zip -d ../
Expand Down

0 comments on commit c0f50d1

Please sign in to comment.