diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 4a8d99052..2a438ee04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,9 @@ git: env: global: - QT_INSTALL_DIR=~/Qt - - QT_VERSION=5.12.8 - - QTCREATOR_VERSION=4.11.2 + - QT_VERSION=5.15.0 + - QTCREATOR_VERSION=4.12.4 + - QTEST_FUNCTION_TIMEOUT=9000000 cache: directories: @@ -48,13 +49,6 @@ jobs: - docker-compose run bionic scripts/build-qbs-with-qmake.sh - <<: *build-on-bionic - name: With Qbs on Ubuntu bionic (mingw32_w64) - env: - BUILD_OPTIONS="profile:qt-mingw32_w64 modules.cpp.compilerWrapper:ccache modules.cpp.treatWarningsAsErrors:true config:release" - script: - - docker-compose run bionic qbs build ${BUILD_OPTIONS} - - - <<: *build-on-bionic name: With Qbs on Ubuntu bionic (linux_clang64 & clang_tidy) env: BUILD_OPTIONS="profile:qt-clang_64 modules.cpp.compilerWrapper:ccache" @@ -81,11 +75,24 @@ jobs: - docker-compose run bionic qbs build modules.cpp.compilerWrapper:ccache modules.qbsbuildconfig.enableBundledQt:true config:release - docker-compose run bionic-android-514 scripts/test-qt-for-android.sh release/install-root/usr/local/bin + - <<: *build-on-bionic + name: With Qbs and with baremetal + before_install: + - docker-compose pull bionic + - docker-compose pull focal-baremetal + script: + - docker-compose run bionic qbs build modules.cpp.compilerWrapper:ccache modules.qbsbuildconfig.enableBundledQt:true config:release + - QBS_AUTOTEST_PROFILE=arm-none-eabi-gcc-9_2 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin + - QBS_AUTOTEST_PROFILE=avr-gcc-5_4 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin + - QBS_AUTOTEST_PROFILE=msp430-gcc-4_6 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin + - QBS_AUTOTEST_PROFILE=sdcc-3_8_0-mcs51 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin + - QBS_AUTOTEST_PROFILE=sdcc-3_8_0-stm8 docker-compose run focal-baremetal scripts/test-baremetal.sh release/install-root/usr/local/bin + - &build-on-macos stage: Build Qbs and and run autotests - name: With Qbs on macOS (xcode 11.3) + name: With Qbs on macOS (xcode 11.5) os: osx - osx_image: xcode11.3 + osx_image: xcode11.5 addons: homebrew: packages: @@ -108,7 +115,9 @@ jobs: before_install: - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QT_VERSION} qtbase qtdeclarative qttools qtscript qtscxml - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QTCREATOR_VERSION} qtcreator - - python3 -m pip install --user beautifulsoup4 lxml + # Hack to workaround the BinaryProbe bug - it prefers /usr/bin/python3 to the one found in PATH + # Older macs, however, do not have python3 in /usr/bin + - /usr/bin/python3 -m pip install --user beautifulsoup4 lxml || python3 -m pip install --user beautifulsoup4 lxml before_script: - ulimit -c unlimited -S # enable core dumps script: @@ -128,7 +137,7 @@ jobs: done; - <<: *build-on-macos - name: With Qbs on macOS (xcode 11.3) using iOS profile + name: With Qbs on macOS (xcode 11.5) using iOS profile if: NOT branch =~ ^gerrit env: # Address sanitizer slows autotests down too much. @@ -192,20 +201,21 @@ jobs: - &build-on-windows stage: Build Qbs and and run autotests - name: With Qbs on Windows (Visual Studio 2017) + name: With Qbs on Windows (Visual Studio 2019) os: windows env: # Need to build in release mode. Otherwise autotests would be too slow. BUILD_OPTIONS="config:release modules.cpp.compilerWrapper:clcache" - QMAKE_PATH=${QT_INSTALL_DIR}/${QT_VERSION}/msvc2017_64/bin/qmake.exe + QMAKE_PATH=${QT_INSTALL_DIR}/${QT_VERSION}/msvc2019_64/bin/qmake.exe PATH="${QT_INSTALL_DIR}/Tools/QtCreator/bin:/c/Python38:/c/Python39:/c/Python38/Scripts:/c/Python39/Scripts:${PATH}" QBS_BUILD_PROFILE=qt CLCACHE_DIR="${HOME}/.ccache" before_install: # Install Qbs and Qt - - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QT_VERSION} --toolchain win64_msvc2017_64 qtbase qtdeclarative qttools qtscript + - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QT_VERSION} --toolchain win64_msvc2019_64 qtbase qtdeclarative qttools qtscript - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QTCREATOR_VERSION} qtcreator - choco install python3 + - choco install -y visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --norestart" - pip3 install conan beautifulsoup4 lxml - pip3 install git+https://github.com/frerich/clcache.git@cae73d8255d78db8ba11e23c51fd2c9a89e7475b before_script: @@ -213,9 +223,11 @@ jobs: after_script: - clcache -s script: + - find "C:/Program Files (x86)/Microsoft Visual Studio/2017" -name vcvarsall.bat + - find "C:/Program Files (x86)/Microsoft Visual Studio/2019" -name vcvarsall.bat - qbs setup-toolchains --detect - qbs setup-qt ${QMAKE_PATH} qt - - qbs config qt.baseProfile MSVC2017-x64 + - qbs config profiles.qt.baseProfile MSVC2019-x64 - qbs config defaultProfile qt - scripts/build-qbs-with-qbs.sh |