Commit 8d2d41ff authored by ab0027's avatar ab0027 💬

APK Builds

parent 066ac1fb
Pipeline #2219 failed with stages
in 82 minutes and 8 seconds
......@@ -4,12 +4,12 @@ variables:
stages:
- .pre
- builds-amd64
- builds-arm64
- builds-arm
- .post
cache:
paths:
- build/
- ./build
before_script:
- cat ubports-pubkey.gpg | apt-key add -
......@@ -17,6 +17,7 @@ before_script:
after_script:
- du -h *.AppImage || true
- du -h *.deb || true
- du -h *.apk || true
###
# Stage builds-amd64
......@@ -32,7 +33,7 @@ build-mauikit-amd64:
paths:
- "mauikit*amd64*.deb"
cache:
key: cache-appimage-amd64
key: cache-builds-amd64
build-index-amd64:
image: mauikit/ubuntu-18.04-amd64
......@@ -47,7 +48,7 @@ build-index-amd64:
- "index*amd64*.AppImage"
- "index*amd64*.deb"
cache:
key: cache-appimage-amd64
key: cache-builds-amd64
build-nota-amd64:
image: mauikit/ubuntu-18.04-amd64
......@@ -61,7 +62,7 @@ build-nota-amd64:
- "nota*amd64*.AppImage"
- "nota*amd64*.deb"
cache:
key: cache-appimage-amd64
key: cache-builds-amd64
build-buho-amd64:
image: mauikit/ubuntu-18.04-amd64
......@@ -75,7 +76,7 @@ build-buho-amd64:
- "buho*amd64*.AppImage"
- "buho*amd64*.deb"
cache:
key: cache-appimage-amd64
key: cache-builds-amd64
build-vvave-amd64:
image: mauikit/ubuntu-18.04-amd64
......@@ -89,7 +90,7 @@ build-vvave-amd64:
- "vvave*amd64*.AppImage"
- "vvave*amd64*.deb"
cache:
key: cache-appimage-amd64
key: cache-builds-amd64
build-pix-amd64:
image: mauikit/ubuntu-18.04-amd64
......@@ -103,7 +104,7 @@ build-pix-amd64:
- "pix*amd64*.AppImage"
- "pix*amd64*.deb"
cache:
key: cache-appimage-amd64
key: cache-builds-amd64
build-station-amd64:
image: mauikit/ubuntu-18.04-amd64
......@@ -117,7 +118,7 @@ build-station-amd64:
- "station*amd64*.AppImage"
- "station*amd64*.deb"
cache:
key: cache-appimage-amd64
key: cache-builds-amd64
build-contacts-amd64:
image: mauikit/ubuntu-18.04-amd64
......@@ -131,18 +132,18 @@ build-contacts-amd64:
- "contacts*amd64*.AppImage"
- "contacts*amd64*.deb"
cache:
key: cache-appimage-amd64
key: cache-builds-amd64
###
# END Stage builds-amd64
###
###
###
# Stage builds-arm64
# Stage builds-arm
###
build-mauikit-arm64:
image: mauikit/ubuntu-18.04-arm64
stage: builds-arm64
stage: builds-arm
script:
- export BRANCH=$([ -z $BRANCH_MAUIKIT ] && echo "master" || echo $BRANCH_MAUIKIT)
- export TARGET_ARCH="arm64"
......@@ -152,11 +153,11 @@ build-mauikit-arm64:
paths:
- "mauikit*arm64*.deb"
cache:
key: cache-appimage-arm64
key: cache-builds-arm
build-index-arm64:
image: mauikit/ubuntu-18.04-arm64
stage: builds-arm64
stage: builds-arm
script:
- export BRANCH=$([ -z $BRANCH_INDEX ] && echo "master" || echo $BRANCH_INDEX)
- export TARGET_ARCH="arm64"
......@@ -166,12 +167,13 @@ build-index-arm64:
paths:
- "index*arm64*.AppImage"
- "index*arm64*.deb"
- "index*.apk"
cache:
key: cache-appimage-arm64
key: cache-builds-arm
build-nota-arm64:
image: mauikit/ubuntu-18.04-arm64
stage: builds-arm64
stage: builds-arm
script:
- export BRANCH=$([ -z $BRANCH_NOTA ] && echo "master" || echo $BRANCH_NOTA)
- export TARGET_ARCH="arm64"
......@@ -181,12 +183,13 @@ build-nota-arm64:
paths:
- "nota*arm64*.AppImage"
- "nota*arm64*.deb"
- "nota*.apk"
cache:
key: cache-appimage-arm64
key: cache-builds-arm
build-buho-arm64:
image: mauikit/ubuntu-18.04-arm64
stage: builds-arm64
stage: builds-arm
script:
- export BRANCH=$([ -z $BRANCH_BUHO ] && echo "master" || echo $BRANCH_BUHO)
- export TARGET_ARCH="arm64"
......@@ -196,12 +199,13 @@ build-buho-arm64:
paths:
- "buho*arm64*.AppImage"
- "buho*arm64*.deb"
- "buho*.apk"
cache:
key: cache-appimage-arm64
key: cache-builds-arm
build-vvave-arm64:
image: mauikit/ubuntu-18.04-arm64
stage: builds-arm64
stage: builds-arm
script:
- export BRANCH=$([ -z $BRANCH_VVAVE ] && echo "master" || echo $BRANCH_VVAVE)
- export TARGET_ARCH="arm64"
......@@ -211,12 +215,13 @@ build-vvave-arm64:
paths:
- "vvave*arm64*.AppImage"
- "vvave*arm64*.deb"
- "vvave*.apk"
cache:
key: cache-appimage-arm64
key: cache-builds-arm
build-pix-arm64:
image: mauikit/ubuntu-18.04-arm64
stage: builds-arm64
stage: builds-arm
script:
- export BRANCH=$([ -z $BRANCH_PIX ] && echo "master" || echo $BRANCH_PIX)
- export TARGET_ARCH="arm64"
......@@ -226,12 +231,13 @@ build-pix-arm64:
paths:
- "pix*arm64*.AppImage"
- "pix*arm64*.deb"
- "pix*.apk"
cache:
key: cache-appimage-arm64
key: cache-builds-arm
build-station-arm64:
image: mauikit/ubuntu-18.04-arm64
stage: builds-arm64
stage: builds-arm
script:
- export BRANCH=$([ -z $BRANCH_STATION ] && echo "master" || echo $BRANCH_STATION)
- export TARGET_ARCH="arm64"
......@@ -242,11 +248,11 @@ build-station-arm64:
- "station*arm64*.AppImage"
- "station*arm64*.deb"
cache:
key: cache-appimage-arm64
key: cache-builds-arm
build-contacts-arm64:
image: mauikit/ubuntu-18.04-arm64
stage: builds-arm64
stage: builds-arm
script:
- export BRANCH=$([ -z $BRANCH_CONTACTS ] && echo "master" || echo $BRANCH_CONTACTS)
- export TARGET_ARCH="arm64"
......@@ -256,10 +262,11 @@ build-contacts-arm64:
paths:
- "contacts*arm64*.AppImage"
- "contacts*arm64*.deb"
- "contacts*.apk"
cache:
key: cache-appimage-arm64
key: cache-builds-arm
###
# END Stage builds-arm64
# END Stage builds-arm
###
......@@ -281,6 +288,7 @@ push-artifacts:
/tmp/mc cp *arm64*.AppImage nx/maui/$BUILD_TYPE/$DATE/;
/tmp/mc cp *amd64*.deb nx/maui/$BUILD_TYPE/$DATE/;
/tmp/mc cp *arm64*.deb nx/maui/$BUILD_TYPE/$DATE/;
/tmp/mc cp *.apk nx/maui/$BUILD_TYPE/$DATE/;
fi
- if [ $BUILD_TYPE = 'stable' ]; then
/tmp/mc mb nx/maui/$BUILD_TYPE/mauikit/$BRANCH_MAUIKIT/;
......
......@@ -52,5 +52,6 @@ export COMMIT_ID=$(cd $SCRIPTPATH/../build/buho-git && git rev-parse --short HEA
appimage-builder --log error --skip-tests --recipe $SCRIPTPATH/appimage-${TARGET_ARCH}.yml
$SCRIPTPATH/../build-deb.sh 'buho' 'https://invent.kde.org/kde/buho.git' $EXTRA_CMAKE_ARGS
$SCRIPTPATH/../build-apk.sh 'buho' 'https://invent.kde.org/kde/buho.git'
$sudo rm -rf ./AppDir ./appimage-builder-cache
#!/bin/bash
set -ex
SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
PROJECT_NAME=$1
GIT_PATH=$2
BUILDDIR=$SCRIPTPATH/build/build-apk-$PROJECT_NAME
echo "\n\n### Building APK"
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/
apt-get update && apt-get install -y --no-install-recommends \
wget \
curl \
git \
unzip \
openjdk-8-jdk \
libdbus-1-3 \
xvfb \
libfontconfig \
python3 \
python3-pip \
libxrender1 \
libxkbcommon-x11-0
echo "\n\n### Checking for cached files"
ls /Qt || true
ls $SCRIPTPATH/Android || true
echo "###\n\n"
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 /Qt --packages qt.qt5.5132.android_armv7
fi
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 $SCRIPTPATH/Android/cmdtools
mv tools/ $SCRIPTPATH/Android/cmdtools/
rm android-tools.zip
(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
COMMIT_ID=$(cd $BUILDDIR && git rev-parse --short HEAD)
(
cd $BUILDDIR
mkdir 3rdparty
(
cd 3rdparty
git clone https://invent.kde.org/maui/mauikit.git --depth 1
git clone https://invent.kde.org/frameworks/kirigami.git --depth 1
cd kirigami
git apply ../../../../kirigami.patch
)
mkdir build
cd build
/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 -j$(nproc) 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
mv $PWD/android-build/build/outputs/apk/debug/*.apk ../../../${PROJECT_NAME}-${BUILD_TYPE}-${APP_VERSION}-git+${COMMIT_ID}-armv7-debug.apk
)
......@@ -10,6 +10,8 @@ BUILDDIR=$SCRIPTPATH/build/build-deb-$PROJECT_NAME
shift
shift
echo "\n\n### Building DEB"
git clone $GIT_PATH $BUILDDIR --depth 1 -b $BRANCH
COMMIT_ID=$(cd $BUILDDIR && git rev-parse --short HEAD)
......
......@@ -52,5 +52,6 @@ export COMMIT_ID=$(cd $SCRIPTPATH/../build//maui-dialer-git && git rev-parse --s
appimage-builder --log error --skip-tests --recipe $SCRIPTPATH/appimage-${TARGET_ARCH}.yml
$SCRIPTPATH/../build-deb.sh 'contacts' 'https://invent.kde.org/kde/maui-dialer.git' $EXTRA_CMAKE_ARGS
$SCRIPTPATH/../build-apk.sh 'contacts' 'https://invent.kde.org/kde/maui-dialer.git'
$sudo rm -rf ./AppDir ./appimage-builder-cache
......@@ -59,5 +59,6 @@ export COMMIT_ID=$(cd $SCRIPTPATH/../build/index-fm-git && git rev-parse --short
appimage-builder --log error --skip-tests --recipe $SCRIPTPATH/appimage-${TARGET_ARCH}.yml
$SCRIPTPATH/../build-deb.sh 'index-fm' 'https://invent.kde.org/kde/index-fm.git' $EXTRA_CMAKE_ARGS
$SCRIPTPATH/../build-apk.sh 'index-fm' 'https://invent.kde.org/kde/index-fm.git'
$sudo rm -rf ./AppDir ./appimage-builder-cache
diff --git a/kirigami.pri b/kirigami.pri
index 922ca53..04b3100 100644
--- a/kirigami.pri
+++ b/kirigami.pri
@@ -27,7 +27,9 @@ HEADERS += $$PWD/src/kirigamiplugin.h \
$$PWD/src/shadowedtexture.h \
$$PWD/src/pagerouter.h \
$$PWD/src/pagepool.h \
- $$PWD/src/avatar.h
+ $$PWD/src/avatar.h \
+ $$PWD/src/imagecolors.h
+
SOURCES += $$PWD/src/kirigamiplugin.cpp \
$$PWD/src/enums.cpp \
$$PWD/src/settings.cpp \
@@ -54,14 +56,16 @@ SOURCES += $$PWD/src/kirigamiplugin.cpp \
$$PWD/src/shadowedtexture.cpp \
$$PWD/src/pagerouter.cpp \
$$PWD/src/pagepool.cpp \
- $$PWD/src/avatar.cpp
+ $$PWD/src/avatar.cpp \
+ $$PWD/src/imagecolors.cpp
INCLUDEPATH += $$PWD/src $$PWD/src/libkirigami
DEFINES += KIRIGAMI_BUILD_TYPE_STATIC
API_VER=1.0
-RESOURCES += $$PWD/kirigami.qrc
+RESOURCES += $$PWD/kirigami.qrc \
+ $$PWD/src/scenegraph/shaders/shaders.qrc
exists($$_PRO_FILE_PWD_/kirigami-icons.qrc) {
message("Using icons QRC file shipped by the project")
diff --git a/src/kirigamiplugin.cpp b/src/kirigamiplugin.cpp
index acdefbc..49199fa 100644
--- a/src/kirigamiplugin.cpp
+++ b/src/kirigamiplugin.cpp
@@ -37,7 +37,7 @@ static QString s_selectedStyle;
//Q_INIT_RESOURCE(kirigami);
#ifdef KIRIGAMI_BUILD_TYPE_STATIC
-#include <qrc_kirigami.cpp>
+//#include <qrc_kirigami.cpp>
#endif
class CopyHelperPrivate : public QObject
......@@ -55,5 +55,6 @@ export COMMIT_ID=$(cd $SCRIPTPATH/../build/nota-git && git rev-parse --short HEA
appimage-builder --log error --skip-tests --recipe $SCRIPTPATH/appimage-${TARGET_ARCH}.yml
$SCRIPTPATH/../build-deb.sh 'nota' 'https://invent.kde.org/kde/nota.git' $EXTRA_CMAKE_ARGS
$SCRIPTPATH/../build-apk.sh 'nota' 'https://invent.kde.org/kde/nota.git'
$sudo rm -rf ./AppDir ./appimage-builder-cache
......@@ -52,5 +52,6 @@ export COMMIT_ID=$(cd $SCRIPTPATH/../build/maui-pix-git && git rev-parse --short
appimage-builder --log error --skip-tests --recipe $SCRIPTPATH/appimage-${TARGET_ARCH}.yml
$SCRIPTPATH/../build-deb.sh 'pix' 'https://invent.kde.org/kde/maui-pix.git' $EXTRA_CMAKE_ARGS
$SCRIPTPATH/../build-apk.sh 'pix' 'https://invent.kde.org/kde/maui-pix.git'
$sudo rm -rf ./AppDir ./appimage-builder-cache
......@@ -53,5 +53,6 @@ export COMMIT_ID=$(cd $SCRIPTPATH/../build/vvave-git && git rev-parse --short HE
appimage-builder --log error --skip-tests --recipe $SCRIPTPATH/appimage-${TARGET_ARCH}.yml
$SCRIPTPATH/../build-deb.sh 'vvave' 'https://invent.kde.org/kde/vvave.git' $EXTRA_CMAKE_ARGS
$SCRIPTPATH/../build-apk.sh 'vvave' 'https://invent.kde.org/kde/vvave.git'
$sudo rm -rf ./AppDir ./appimage-builder-cache
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