Browse Source

Enable all builds once again

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.3.0-RC1
falkTX 3 years ago
parent
commit
6c2c3be7d7
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 23 additions and 27 deletions
  1. +22
    -23
      .travis.yml
  2. +1
    -4
      build.sh

+ 22
- 23
.travis.yml View File

@@ -19,30 +19,30 @@ env:
- BOOTSTRAP_VERSION=2

jobs:
## linux with win32 cross-compilation
#- name: "win32 cross-compiled"
#os: linux
#compiler: gcc
#env:
#- TARGET="win32"
#services:
#- xvfb
# linux with win32 cross-compilation
- name: "win32 cross-compiled"
os: linux
compiler: gcc
env:
- TARGET="win32"
services:
- xvfb

## linux with win64 cross-compilation
#- name: "win64 cross-compiled"
#os: linux
#compiler: gcc
#env:
#- TARGET="win64"
#services:
#- xvfb
# linux with win64 cross-compilation
- name: "win64 cross-compiled"
os: linux
compiler: gcc
env:
- TARGET="win64"
services:
- xvfb

## macOS native intel build
#- name: "macOS native intel"
#os: osx
#osx_image: xcode9.4
#env:
#- TARGET="macos"
# macOS native intel build
- name: "macOS native intel"
os: osx
osx_image: xcode9.4
env:
- TARGET="macos"

# macOS universal build
- name: "macOS universal"
@@ -58,7 +58,6 @@ install:
- bash ${TRAVIS_BUILD_DIR}/.travis/install.sh

script:
- echo 1 > ${HOME}/PawPawBuilds/builds/macos-universal/.last-build-version
- bash ${TRAVIS_BUILD_DIR}/build.sh ${TARGET}

deploy:


+ 1
- 4
build.sh View File

@@ -51,7 +51,7 @@ fi
if [ ${BUILD_VERSION} -eq 2 ]; then
# qt build takes too long on macos-universal target, download and use premade builds
if [ "${TARGET}" = "macos-universal" ]; then
CROSS_COMPILING=1
CROSS_COMPILING=0
MACOS=1
MACOS_OLD=0
MACOS_UNIVERSAL=1
@@ -78,9 +78,6 @@ if [ ${BUILD_VERSION} -eq 2 ]; then
curl -L "https://falktx.com/data/pawpaw-qt-macos-universal.tar.xz" -o "pawpaw-qt-macos-universal.tar.xz" --fail
tar xvf pawpaw-qt-macos-universal.tar.xz
popd
${TRAVIS_BUILD_DIR}/PawPaw/bootstrap-carla.sh ${TARGET}
${TRAVIS_BUILD_DIR}/PawPaw/.cleanup.sh ${TARGET}
exit 0
fi
${TRAVIS_BUILD_DIR}/PawPaw/bootstrap-qt.sh ${TARGET}
${TRAVIS_BUILD_DIR}/PawPaw/.cleanup.sh ${TARGET}


Loading…
Cancel
Save