diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0e435b1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -language: cpp - -# Build matrix. -matrix: - include: - - os: linux - dist: xenial - sudo: required - compiler: gcc - - os: osx - compiler: clang - -# Use Ubuntu 14.04 as the build environment. -sudo: required -dist: trusty - -# Build dependencies. -addons: - apt: - packages: - - cmake - - libgmp-dev - - nettle-dev - - libudev-dev - - qtbase5-dev - - qttools5-dev-tools - -# Run the build script. -script: ./travis.sh - -notifications: - irc: "ircs://irc.badnik.zone:6697/#GensGS" diff --git a/appveyor-dpkg.sh b/appveyor-dpkg.sh new file mode 100755 index 0000000..6afe2bc --- /dev/null +++ b/appveyor-dpkg.sh @@ -0,0 +1,16 @@ +!/bin/sh +set -ev + +add-apt-repository --remove "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" + +apt-get update +apt-get -y install \ + cmake \ + pkg-config \ + libgmp-dev \ + nettle-dev \ + libudev-dev \ + \ + qtbase5-dev \ + qttools5-dev \ + qttools5-dev-tools diff --git a/appveyor.sh b/appveyor.sh new file mode 100755 index 0000000..fb647ab --- /dev/null +++ b/appveyor.sh @@ -0,0 +1,12 @@ +#!/bin/sh +set -ev +cmake --version + +mkdir build || true +cd build + +cmake .. -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_NLS=OFF \ + -DBUILD_TESTING=ON diff --git a/appveyor.yml b/appveyor.yml index de595df..46b35ff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,17 @@ version: '1.1.1.{build}' # Build worker image (VM template) -image: Visual Studio 2013 +image: + - Visual Studio 2013 + - Ubuntu +configuration: + - Debug + - Release +platform: + - x86 + - x64 + +# TODO: Re-add MinGW-w64 compiler for Windows builds. # scripts that are called at very beginning, before repo cloning init: @@ -27,45 +37,26 @@ branches: except: - l10n_master -environment: - matrix: - - platform: x86 - configuration: Debug - compiler: msvc2013 - - - platform: x86 - configuration: Release - compiler: msvc2013 - - - platform: x64 - configuration: Debug - compiler: msvc2013 - - - platform: x64 - configuration: Release - compiler: msvc2013 - -# - platform: x86 -# configuration: Debug -# compiler: mingw-w64 - -# - platform: x64 -# configuration: Debug -# compiler: mingw-w64 - # Run CMake. before_build: - - cd %APPVEYOR_BUILD_FOLDER% - - appveyor.cmd + - cmd: cd %APPVEYOR_BUILD_FOLDER% + - cmd: appveyor.cmd + - sh: cd ${APPVEYOR_BUILD_FOLDER} + - sh: sudo ./appveyor-dpkg.sh + - sh: ./appveyor.sh build_script: - - cd %APPVEYOR_BUILD_FOLDER%\build - - cmake --build . --config %configuration% + - cmd: cd %APPVEYOR_BUILD_FOLDER%\build + - cmd: cmake --build . --config %configuration% + - sh: cd ${APPVEYOR_BUILD_FOLDER}/build + - sh: cmake --build . --config ${CONFIGURATION} test_script: - - cd %APPVEYOR_BUILD_FOLDER%\build - - ctest -V -C %configuration% + - cmd: cd %APPVEYOR_BUILD_FOLDER%\build + - cmd: ctest -V -C %configuration% + - sh: cd ${APPVEYOR_BUILD_FOLDER}/build + - sh: ctest -V -C ${CONFIGURATION} after_test: - - cd %APPVEYOR_BUILD_FOLDER%\build - - ..\appveyor-artifacts.cmd + - cmd: cd %APPVEYOR_BUILD_FOLDER%\build + - cmd: ..\appveyor-artifacts.cmd diff --git a/travis.sh b/travis.sh deleted file mode 100755 index ca78d51..0000000 --- a/travis.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -RET=0 -mkdir "${TRAVIS_BUILD_DIR}/build" -cd "${TRAVIS_BUILD_DIR}/build" -cmake --version -cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_NLS=OFF \ - -DBUILD_TESTING=ON \ - || exit 1 -# Build everything. -make -k || RET=1 -# Test with en_US.UTF8. -LC_ALL="en_US.UTF8" ctest -V || RET=1 -# Test with fr_FR.UTF8 to find i18n issues. -LC_ALL="fr_FR.UTF8" ctest -V || RET=1 -exit "${RET}"