Commit a5184e9b authored by ab0027's avatar ab0027 💬

Update Qt install path

parent 4a8e032f
Pipeline #2208 failed with stages
in 9 minutes and 11 seconds
......@@ -155,7 +155,7 @@ build-mauikit-arm64:
cache:
key: cache-builds-arm
paths:
- ./Qt
- /Qt
- ./Android
- ./build
......@@ -174,7 +174,7 @@ build-index-arm64:
cache:
key: cache-builds-arm
paths:
- ./Qt
- /Qt
- ./Android
- ./build
......@@ -193,7 +193,7 @@ build-nota-arm64:
cache:
key: cache-builds-arm
paths:
- ./Qt
- /Qt
- ./Android
- ./build
......@@ -212,7 +212,7 @@ build-buho-arm64:
cache:
key: cache-builds-arm
paths:
- ./Qt
- /Qt
- ./Android
- ./build
......@@ -231,7 +231,7 @@ build-vvave-arm64:
cache:
key: cache-builds-arm
paths:
- ./Qt
- /Qt
- ./Android
- ./build
......@@ -250,7 +250,7 @@ build-pix-arm64:
cache:
key: cache-builds-arm
paths:
- ./Qt
- /Qt
- ./Android
- ./build
......@@ -269,7 +269,7 @@ build-station-arm64:
cache:
key: cache-builds-arm
paths:
- ./Qt
- /Qt
- ./Android
- ./build
......@@ -288,7 +288,7 @@ build-contacts-arm64:
cache:
key: cache-builds-arm
paths:
- ./Qt
- /Qt
- ./Android
- ./build
###
......
......@@ -9,7 +9,7 @@ BUILDDIR=$SCRIPTPATH/build/build-apk-$PROJECT_NAME
echo "\n\n### Building APK"
export PATH=$PATH:$SCRIPTPATH/Android/cmdtools/tools/bin/:$SCRIPTPATH/Android/cmdtools/tools/:$SCRIPTPATH/Qt/5.13.2/android/bin/
export PATH=$PATH:$SCRIPTPATH/Android/cmdtools/tools/bin/:$SCRIPTPATH/Android/cmdtools/tools/:/Qt/5.13.2/android/bin/
export ANDROID_HOME=$SCRIPTPATH/Android/
export ANDROID_SDK_ROOT=$SCRIPTPATH/Android/
export ANDROID_NDK_ROOT=$SCRIPTPATH/Android/ndk/19.2.5345600/
......@@ -29,13 +29,13 @@ apt-get update && apt-get install -y --no-install-recommends \
libxkbcommon-x11-0
echo "\n\n### Checking for cached files"
ls $SCRIPTPATH/Qt || true
ls /Qt || true
ls $SCRIPTPATH/Android || true
echo "###\n\n"
if [ ! -d $SCRIPTPATH/Qt ]; then
if [ ! -d /Qt ]; then
pip3 install --upgrade git+https://github.com/hasboeuf/cuteci.git
cuteci --installer http://download.qt.io/official_releases/qt/5.13/5.13.2/qt-opensource-linux-x64-5.13.2.run install --destdir $SCRIPTPATH/Qt --packages qt.qt5.5132.android
cuteci --installer http://download.qt.io/official_releases/qt/5.13/5.13.2/qt-opensource-linux-x64-5.13.2.run install --destdir /Qt --packages qt.qt5.5132.android
fi
if [ ! -d $SCRIPTPATH/Android ]; then
......@@ -63,9 +63,9 @@ COMMIT_ID=$(cd $BUILDDIR && git rev-parse --short HEAD)
mkdir build
cd build
$SCRIPTPATH/Qt/5.13.2/android_armv7/bin/qmake ANDROID_ABIS="armeabi-v7a" CONFIG+=qtquickcompiler -spec android-clang ../*.pro
/Qt/5.13.2/android_armv7/bin/qmake ANDROID_ABIS="armeabi-v7a" CONFIG+=qtquickcompiler -spec android-clang ../*.pro
$SCRIPTPATH/Android/ndk/19.2.5345600/prebuilt/linux-x86_64/bin/make -j8 install INSTALL_ROOT=android-build
[ -d ../android_files ] && cp -r ../android_files/* ./android-build/
$SCRIPTPATH/Qt/5.13.2/android_armv7/bin/androiddeployqt --verbose --input $PWD/*.json --output $PWD/android-build --android-platform android-29 --gradle | tee $PROJECT_NAME.log 2>&1
/Qt/5.13.2/android_armv7/bin/androiddeployqt --verbose --input $PWD/*.json --output $PWD/android-build --android-platform android-29 --gradle | tee $PROJECT_NAME.log 2>&1
mv $PWD/android-build/build/outputs/apk/debug/*.apk ../../${PROJECT_NAME}-${BUILD_TYPE}-${APP_VERSION}-git+${COMMIT_ID}-armv7-debug.deb
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment