Commit 4a8e032f authored by ab0027's avatar ab0027 💬

Update Qt and Android path

parent 9bbcde44
Pipeline #2207 failed with stages
in 8 minutes and 11 seconds
......@@ -155,8 +155,8 @@ build-mauikit-arm64:
cache:
key: cache-builds-arm
paths:
- /Qt
- /Android
- ./Qt
- ./Android
- ./build
build-index-arm64:
......@@ -174,8 +174,8 @@ build-index-arm64:
cache:
key: cache-builds-arm
paths:
- /Qt
- /Android
- ./Qt
- ./Android
- ./build
build-nota-arm64:
......@@ -193,8 +193,8 @@ build-nota-arm64:
cache:
key: cache-builds-arm
paths:
- /Qt
- /Android
- ./Qt
- ./Android
- ./build
build-buho-arm64:
......@@ -212,8 +212,8 @@ build-buho-arm64:
cache:
key: cache-builds-arm
paths:
- /Qt
- /Android
- ./Qt
- ./Android
- ./build
build-vvave-arm64:
......@@ -231,8 +231,8 @@ build-vvave-arm64:
cache:
key: cache-builds-arm
paths:
- /Qt
- /Android
- ./Qt
- ./Android
- ./build
build-pix-arm64:
......@@ -250,8 +250,8 @@ build-pix-arm64:
cache:
key: cache-builds-arm
paths:
- /Qt
- /Android
- ./Qt
- ./Android
- ./build
build-station-arm64:
......@@ -269,8 +269,8 @@ build-station-arm64:
cache:
key: cache-builds-arm
paths:
- /Qt
- /Android
- ./Qt
- ./Android
- ./build
build-contacts-arm64:
......@@ -288,8 +288,8 @@ build-contacts-arm64:
cache:
key: cache-builds-arm
paths:
- /Qt
- /Android
- ./Qt
- ./Android
- ./build
###
# END Stage builds-arm
......
......@@ -9,10 +9,10 @@ BUILDDIR=$SCRIPTPATH/build/build-apk-$PROJECT_NAME
echo "\n\n### Building APK"
export PATH=$PATH:/Android/cmdtools/tools/bin/:/Android/cmdtools/tools/:/opt/Qt/5.13.2/android/bin/
export ANDROID_HOME=/Android/
export ANDROID_SDK_ROOT=/Android/
export ANDROID_NDK_ROOT=/Android/ndk/19.2.5345600/
export PATH=$PATH:$SCRIPTPATH/Android/cmdtools/tools/bin/:$SCRIPTPATH/Android/cmdtools/tools/:$SCRIPTPATH/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/
apt-get update && apt-get install -y --no-install-recommends \
wget \
......@@ -29,24 +29,23 @@ apt-get update && apt-get install -y --no-install-recommends \
libxkbcommon-x11-0
echo "\n\n### Checking for cached files"
ls /Qt || true
ls /Android || true
ls $SCRIPTPATH/Qt || true
ls $SCRIPTPATH/Android || true
echo "###\n\n"
if [ ! -d /Qt ]; then
if [ ! -d $SCRIPTPATH/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 /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 $SCRIPTPATH/Qt --packages qt.qt5.5132.android
fi
if [ ! -d /Android ]; then
if [ ! -d $SCRIPTPATH/Android ]; then
wget https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip -O android-tools.zip
unzip android-tools.zip
mkdir -p /Android/cmdtools
mv tools/ /Android/cmdtools/
mkdir -p $SCRIPTPATH/Android/cmdtools
mv tools/ $SCRIPTPATH/Android/cmdtools/
rm android-tools.zip
alias sdkmanager="sdkmanager --sdk_root=/Android"
(sleep 5; while true; do sleep 1; printf 'y\r\n'; done) | sdkmanager "build-tools;29.0.3" "ndk;19.2.5345600" "platform-tools" "platforms;android-29"
(sleep 5; while true; do sleep 1; printf 'y\r\n'; done) | sdkmanager --sdk_root=$SCRIPTPATH/Android "build-tools;29.0.3" "ndk;19.2.5345600" "platform-tools" "platforms;android-29"
fi
git clone $GIT_PATH $BUILDDIR -b $BRANCH --depth 1
......@@ -64,9 +63,9 @@ COMMIT_ID=$(cd $BUILDDIR && git rev-parse --short HEAD)
mkdir build
cd build
/Qt/5.13.2/android_armv7/bin/qmake ANDROID_ABIS="armeabi-v7a" CONFIG+=qtquickcompiler -spec android-clang ../*.pro
/Android/ndk/19.2.5345600/prebuilt/linux-x86_64/bin/make -j8 install INSTALL_ROOT=android-build
$SCRIPTPATH/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/
/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
$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
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