Browse Source

Use trusty for CI and other fixes

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.0
falkTX 5 years ago
parent
commit
30ea551474
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 12 additions and 8 deletions
  1. +8
    -4
      .travis.yml
  2. +2
    -2
      .travis/install.sh
  3. +2
    -2
      setup/check_target.sh

+ 8
- 4
.travis.yml View File

@@ -2,7 +2,11 @@ language: cpp


os: linux os: linux


dist: bionic
dist: trusty

cache:
directories:
- ${HOME}/PawPawBuilds/downloads


jobs: jobs:
include: include:
@@ -44,6 +48,6 @@ script:
- bash ${TRAVIS_BUILD_DIR}/bootstrap.sh ${TARGET} - bash ${TRAVIS_BUILD_DIR}/bootstrap.sh ${TARGET}
- bash ${TRAVIS_BUILD_DIR}/build-plugin.sh ${TARGET} ${PLUGINS} - bash ${TRAVIS_BUILD_DIR}/build-plugin.sh ${TARGET} ${PLUGINS}


notifications:
email: true
irc: "ircs://chat.freenode.net:7070/#kxstudio"
#notifications:
#email: true
#irc: "ircs://chat.freenode.net:7070/#kxstudio"

+ 2
- 2
.travis/install.sh View File

@@ -10,9 +10,9 @@ if [ "${TARGET}" = "macos-old" ]; then
sudo apt-get install -y apple-x86-gcc apple-uni-sdk-10.5 sudo apt-get install -y apple-x86-gcc apple-uni-sdk-10.5


elif [ "${TARGET}" = "win32" ]; then elif [ "${TARGET}" = "win32" ]; then
sudo apt-get install -y mingw-w64 binutils-mingw-w64-i686 g++-mingw-w64-i686
sudo apt-get install -y mingw32-x-gcc


elif [ "${TARGET}" = "win64" ]; then elif [ "${TARGET}" = "win64" ]; then
sudo apt-get install -y mingw-w64 binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
sudo apt-get install -y mingw64-x-gcc


fi fi

+ 2
- 2
setup/check_target.sh View File

@@ -9,7 +9,7 @@ WIN64=0


function check_target() { function check_target() {
case "${target}" in case "${target}" in
"macos")
"macos"|"Darwin")
MACOS=1 MACOS=1
;; ;;
"macos-old") "macos-old")
@@ -26,7 +26,7 @@ function check_target() {
WIN64=1 WIN64=1
CROSS_COMPILING=1 CROSS_COMPILING=1
;; ;;
"Linux")
"linux"|"Linux")
LINUX=1 LINUX=1
;; ;;
"native") "native")


Loading…
Cancel
Save