Travis build fix
This commit is contained in:
parent
35165ba2b8
commit
b5f97c0d94
2 changed files with 24 additions and 19 deletions
38
.travis.yml
38
.travis.yml
|
@ -10,7 +10,8 @@ jobs:
|
||||||
os: osx
|
os: osx
|
||||||
osx_image: xcode13.4
|
osx_image: xcode13.4
|
||||||
language: cpp
|
language: cpp
|
||||||
|
cache: ccache
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- QT_VERSION=5.15.2
|
- QT_VERSION=5.15.2
|
||||||
- QIF_VERSION=4.4
|
- QIF_VERSION=4.4
|
||||||
|
@ -152,6 +153,7 @@ jobs:
|
||||||
- name: Linux
|
- name: Linux
|
||||||
os: linux
|
os: linux
|
||||||
dist: focal
|
dist: focal
|
||||||
|
cache: ccache
|
||||||
|
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
|
@ -159,6 +161,8 @@ jobs:
|
||||||
- p7zip
|
- p7zip
|
||||||
- python3
|
- python3
|
||||||
- python3-pip
|
- python3-pip
|
||||||
|
- libgl-dev
|
||||||
|
- mesa-common-dev
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- QT_VERSION=5.15.2
|
- QT_VERSION=5.15.2
|
||||||
|
@ -198,7 +202,8 @@ jobs:
|
||||||
- name: Android
|
- name: Android
|
||||||
os: linux
|
os: linux
|
||||||
language: android
|
language: android
|
||||||
dist: focal
|
dist: xenial
|
||||||
|
cache: ccache
|
||||||
|
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
|
@ -207,23 +212,24 @@ jobs:
|
||||||
- python3
|
- python3
|
||||||
- python3-pip
|
- python3-pip
|
||||||
|
|
||||||
components:
|
android:
|
||||||
# Uncomment the lines below if you want to
|
components:
|
||||||
# use the latest revision of Android SDK Tools
|
# Uncomment the lines below if you want to
|
||||||
# - tools
|
# use the latest revision of Android SDK Tools
|
||||||
# - platform-tools
|
# - tools
|
||||||
|
# - platform-tools
|
||||||
|
|
||||||
# The BuildTools version used by your project
|
# The BuildTools version used by your project
|
||||||
- build-tools-30.0.2
|
- build-tools-30.0.2
|
||||||
|
|
||||||
# The SDK version used to compile your project
|
# The SDK version used to compile your project
|
||||||
- android-30
|
- android-30
|
||||||
|
|
||||||
# Additional components
|
# Additional components
|
||||||
- extra
|
- extra
|
||||||
- extra-google-google_play_services
|
- extra-google-google_play_services
|
||||||
- extra-google-m2repository
|
- extra-google-m2repository
|
||||||
- extra-android-m2repository
|
- extra-android-m2repository
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- QT_VERSION=5.15.2
|
- QT_VERSION=5.15.2
|
||||||
|
|
|
@ -39,9 +39,8 @@ $QT_BIN_DIR/qmake -v
|
||||||
|
|
||||||
# Build App
|
# Build App
|
||||||
echo "Building App..."
|
echo "Building App..."
|
||||||
cd PROJECT_DIR=$(pwd)/client
|
cd $PROJECT_DIR/client
|
||||||
|
$PROJECT_DIR/client/scripts/apple_compile.sh ios
|
||||||
./scripts/apple_compile.sh ios
|
|
||||||
|
|
||||||
# Build and run tests here
|
# Build and run tests here
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue