mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-22 02:01:08 +07:00
Travis build fix
This commit is contained in:
+20
-7
@@ -153,6 +153,13 @@ jobs:
|
|||||||
os: linux
|
os: linux
|
||||||
dist: focal
|
dist: focal
|
||||||
|
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- p7zip
|
||||||
|
- python3
|
||||||
|
- python3-pip
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- QT_VERSION=5.15.2
|
- QT_VERSION=5.15.2
|
||||||
- QIF_VERSION=4.4
|
- QIF_VERSION=4.4
|
||||||
@@ -162,13 +169,11 @@ jobs:
|
|||||||
install:
|
install:
|
||||||
- |
|
- |
|
||||||
if [ ! -f $QT_BIN_DIR/qmake ]; then \
|
if [ ! -f $QT_BIN_DIR/qmake ]; then \
|
||||||
sudo apt-get update && \
|
|
||||||
sudo apt install -yy p7zip python3 python3-pip && \
|
|
||||||
python3 -m pip install --user $(whoami) --upgrade pip && \
|
python3 -m pip install --user $(whoami) --upgrade pip && \
|
||||||
export PATH=$HOME/.local/bin:$PATH && \
|
export PATH=$HOME/.local/bin:$PATH && \
|
||||||
python3 -m pip install -U aqtinstall requests py7zr && \
|
python3 -m pip install -U aqtinstall requests py7zr && \
|
||||||
python3 -m pip show aqtinstall && \
|
python3 -m pip show aqtinstall && \
|
||||||
python3 -m aqt install-qt linux desktop $QT_VERSION clang_64 -m all -O $HOME/Qt && \
|
python3 -m aqt install-qt linux desktop $QT_VERSION gcc_64 -m all -O $HOME/Qt && \
|
||||||
python3 -m aqt install-tool linux desktop tools_ifw -O $HOME/Qt ; \
|
python3 -m aqt install-tool linux desktop tools_ifw -O $HOME/Qt ; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -195,6 +200,13 @@ jobs:
|
|||||||
language: android
|
language: android
|
||||||
dist: focal
|
dist: focal
|
||||||
|
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- p7zip
|
||||||
|
- python3
|
||||||
|
- python3-pip
|
||||||
|
|
||||||
components:
|
components:
|
||||||
# Uncomment the lines below if you want to
|
# Uncomment the lines below if you want to
|
||||||
# use the latest revision of Android SDK Tools
|
# use the latest revision of Android SDK Tools
|
||||||
@@ -222,9 +234,6 @@ jobs:
|
|||||||
install:
|
install:
|
||||||
- |
|
- |
|
||||||
if [ ! -f $QT_BIN_DIR/qmake ]; then \
|
if [ ! -f $QT_BIN_DIR/qmake ]; then \
|
||||||
sudo apt-get update && \
|
|
||||||
sudo apt install -yy p7zip python3 python3-pip && \
|
|
||||||
python3 -m pip install --user $(whoami) --upgrade pip && \
|
|
||||||
export PATH=$HOME/.local/bin:$PATH && \
|
export PATH=$HOME/.local/bin:$PATH && \
|
||||||
python3 -m pip install -U aqtinstall requests py7zr && \
|
python3 -m pip install -U aqtinstall requests py7zr && \
|
||||||
python3 -m pip show aqtinstall && \
|
python3 -m pip show aqtinstall && \
|
||||||
@@ -272,8 +281,10 @@ jobs:
|
|||||||
language: cpp
|
language: cpp
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
- PATH=$PATH:~/go/bin
|
||||||
- QT_VERSION=5.15.2
|
- QT_VERSION=5.15.2
|
||||||
- QT_BIN_DIR=$HOME/Qt/$QT_VERSION/ios/bin
|
- QT_BIN_DIR=$HOME/Qt/$QT_VERSION/ios/bin
|
||||||
|
- QT_IOS_BIN=$QT_BIN_DIR
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- |
|
- |
|
||||||
@@ -284,7 +295,9 @@ jobs:
|
|||||||
pip show aqtinstall && \
|
pip show aqtinstall && \
|
||||||
aqt install-qt mac ios $QT_VERSION -m all -O $HOME/Qt ; \
|
aqt install-qt mac ios $QT_VERSION -m all -O $HOME/Qt ; \
|
||||||
fi
|
fi
|
||||||
- brew install golang && go install golang.org/x/mobile/cmd/gomobile@latest && gomobile init && \
|
- brew install golang
|
||||||
|
- go install golang.org/x/mobile/cmd/gomobile@latest
|
||||||
|
- gomobile init
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- bash deploy/build_ios.sh
|
- bash deploy/build_ios.sh
|
||||||
|
|||||||
Reference in New Issue
Block a user