Commit 8d43974e authored by ab0027's avatar ab0027 💬

Merge branch 'master' into development

parents ce428752 d4c50fbd
Pipeline #2221 canceled with stages
in 4 seconds
......@@ -52,6 +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'
echo $TARGET_ARCH | grep -Eq "arm*" && $SCRIPTPATH/../build-apk.sh 'buho' 'https://invent.kde.org/kde/buho.git'
$sudo rm -rf ./AppDir ./appimage-builder-cache
......@@ -53,7 +53,7 @@ COMMIT_ID=$(cd $BUILDDIR && git rev-parse --short HEAD)
(
cd $BUILDDIR
mkdir 3rdparty
mkdir -p 3rdparty
(
cd 3rdparty
......@@ -63,7 +63,7 @@ COMMIT_ID=$(cd $BUILDDIR && git rev-parse --short HEAD)
cd kirigami
git apply ../../../../kirigami.patch
)
mkdir build
mkdir -p build
cd build
/Qt/5.13.2/android_armv7/bin/qmake ANDROID_ABIS="armeabi-v7a" CONFIG+=qtquickcompiler -spec android-clang ../*.pro
......
......@@ -52,6 +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'
echo $TARGET_ARCH | grep -Eq "arm*" && $SCRIPTPATH/../build-apk.sh 'contacts' 'https://invent.kde.org/kde/maui-dialer.git'
$sudo rm -rf ./AppDir ./appimage-builder-cache
......@@ -59,6 +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'
echo $TARGET_ARCH | grep -Eq "arm*" && $SCRIPTPATH/../build-apk.sh 'index-fm' 'https://invent.kde.org/kde/index-fm.git'
$sudo rm -rf ./AppDir ./appimage-builder-cache
......@@ -55,6 +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'
echo $TARGET_ARCH | grep -Eq "arm*" && $SCRIPTPATH/../build-apk.sh 'nota' 'https://invent.kde.org/kde/nota.git'
$sudo rm -rf ./AppDir ./appimage-builder-cache
......@@ -52,6 +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'
echo $TARGET_ARCH | grep -Eq "arm*" && $SCRIPTPATH/../build-apk.sh 'pix' 'https://invent.kde.org/kde/maui-pix.git'
$sudo rm -rf ./AppDir ./appimage-builder-cache
......@@ -53,6 +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'
echo $TARGET_ARCH | grep -Eq "arm*" && $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