From 448c01ca99e26f3512c4dec4a911d0cd6abbc755 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Sun, 4 Sep 2022 14:49:33 +0300
Subject: [PATCH] Travis build fix

---
 .gitlab-ci.yml          | 27 ---------------------------
 .travis.yml             | 22 ++++++++++++++--------
 deploy/build_android.sh | 12 +++++-------
 3 files changed, 19 insertions(+), 42 deletions(-)
 delete mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 6c8fa28b..00000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-variables:
-    GIT_STRATEGY: clone
-
-stages:
-  - build
-
-build-windows:
-  stage: build
-  tags:
-    - windows
-  script:
-    - cmd.exe /k "deploy\windows-env.bat && cd deploy && windows.bat"
-  artifacts:
-    name: artifacts-windows
-    paths:
-    - AmneziaVPN.exe
-
-build-macos:
-  stage: build
-  tags:
-    - macos
-  script:
-    - cd deploy && ./macos.sh
-  artifacts:
-    name: artifacts-macos
-    paths:
-    - AmneziaVPN.dmg
diff --git a/.travis.yml b/.travis.yml
index 70d9b6ec..a3d7eacd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -220,14 +220,20 @@ jobs:
         - PROJ_ROOT=$(pwd)
         - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 
+      addons:
+        apt:
+          packages:
+          - p7zip
+          - python3
+          - python3-pip
+          - openjdk-8-jdk
+
       install:
-        - echo "Installing Java 8"
-        - sudo apt-get install openjdk-8-jdk > /dev/null
-        - echo "QT bin install" && pwd
-        - if [ ! -f $QT_BIN_DIR/qmake ]; then
-          wget https://ondjoss.com/qt15_2_android_linux_x86_64.zip > /dev/null && 
-          mkdir -p $HOME/Qt/$QT_VERSION && \
-          unzip ./qt15_2_android_linux_x86_64.zip -d $HOME/Qt/$QT_VERSION > /dev/null ; 
+        - |
+          if [ ! -f $QT_BIN_DIR/qmake ]; then \
+          python3 -m pip install -U aqtinstall requests py7zr && \
+          python3 -m pip show aqtinstall && \
+          python3 -m aqt install-qt linux android $QT_VERSION -m all -O $HOME/Qt ; \
           fi
         - echo "Download SDK" && pwd
         - export ANDROID_HOME=`pwd`/sdk
@@ -257,7 +263,7 @@ jobs:
         - echo "Check env vars" && echo $ANDROID_SDK_ROOT && echo $ANDROID_NDK_ROOT && echo $QT_BIN_DIR
 
       script:
-        - travis_wait 60 bash deploy/build_android.sh
+        - deploy/build_android.sh
 
       after_script:
         - ccache --show-stats
diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 2b46b5fb..75e8c46c 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -30,16 +30,16 @@ QMAKE_STASH_FILE=$PROJECT_DIR/.qmake_stash
 if [ -z "${QT_VERSION+x}" ]; then
 QT_VERSION=5.15.2;
 QT_BIN_DIR=$HOME/Qt/$QT_VERSION/android/bin
-#QT_BIN_DIR=$HOME/Qt/$QT_VERSION/gcc_64/bin
 fi
 
 echo "Using Qt in $QT_BIN_DIR"
+echo "Using Android SDK in $ANDROID_SDK_ROOT"
+echo "Using Android NDK in $ANDROID_NDK_ROOT"
 
 
 # Checking env
 $QT_BIN_DIR/qmake -v
-make -v
-gcc -v
+$ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -v
 
 # Build App
 echo "Building App..."
@@ -47,16 +47,14 @@ cd $BUILD_DIR
 
 $QT_BIN_DIR/qmake  -r -spec android-clang CONFIG+=qtquickcompiler ANDROID_ABIS="armeabi-v7a arm64-v8a x86 x86_64" $PROJECT_DIR/AmneziaVPN.pro
 echo "Executing make... may take long time"
-$ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -j2 > /dev/null 2>/dev/null
+$ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -j2
 echo "Make install..."
-$ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make install INSTALL_ROOT=android > /dev/null 2>/dev/null
+$ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make install INSTALL_ROOT=android
 echo "Build OK"
-# Build and run tests here
 
 echo "............Deploy.................."
 cd $OUT_APP_DIR
 
-#--verbose removed
 $QT_BIN_DIR/androiddeployqt \
     --output $OUT_APP_DIR/android \
     --gradle \