Commit 520d424f authored by ab0027's avatar ab0027 💬

Fix arm64 builds

parent ad80b61b
Pipeline #2626 canceled with stages
in 26 minutes and 7 seconds
......@@ -100,35 +100,35 @@ builds-amd64:
###
# Stage builds-arm
###
# builds-arm64:
# image: mauikit/ubuntu-18.04-arm64
# stage: builds-arm
# script:
# - rm -rf ./build/
# - export TARGET_ARCH="arm64"
# - export EXTRA_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=/arm64-toolchain.cmake"
# - export BRANCH=$([ -z $BRANCH_MAUIKIT ] && echo "master" || echo $BRANCH_MAUIKIT)
# - ./mauikit/build.sh
# - export BRANCH=$([ -z $BRANCH_INDEX ] && echo "master" || echo $BRANCH_INDEX)
# - ./index/build.sh
# #- ./build-apk.sh 'index-fm' 'https://invent.kde.org/maui/index-fm.git'
# - export BRANCH=$([ -z $BRANCH_NOTA ] && echo "master" || echo $BRANCH_NOTA)
# - ./nota/build.sh
# #- ./build-apk.sh 'nota' 'https://invent.kde.org/maui/nota.git'
# - export BRANCH=$([ -z $BRANCH_BUHO ] && echo "master" || echo $BRANCH_BUHO)
# - ./buho/build.sh
# #- ./build-apk.sh 'buho' 'https://invent.kde.org/maui/buho.git'
# - export BRANCH=$([ -z $BRANCH_VVAVE ] && echo "master" || echo $BRANCH_VVAVE)
# - ./vvave/build.sh
# #- ./build-apk.sh 'vvave' 'https://invent.kde.org/maui/vvave.git'
# #- export BRANCH=$([ -z $BRANCH_PIX ] && echo "master" || echo $BRANCH_PIX)
# #- ./pix/build.sh
# #- ./build-apk.sh 'pix' 'https://invent.kde.org/maui/maui-pix.git'
# - export BRANCH=$([ -z $BRANCH_STATION ] && echo "master" || echo $BRANCH_STATION)
# - ./station/build.sh
# - export BRANCH=$([ -z $BRANCH_CONTACTS ] && echo "master" || echo $BRANCH_CONTACTS)
# - ./communicator/build.sh
# #- ./build-apk.sh 'communicator' 'https://invent.kde.org/maui/maui-dialer.git'
builds-arm64:
image: mauikit/ubuntu-18.04-arm64
stage: builds-arm
script:
- rm -rf ./build/
- export TARGET_ARCH="arm64"
- export EXTRA_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=/arm64-toolchain.cmake"
- export BRANCH=$([ -z $BRANCH_MAUIKIT ] && echo "master" || echo $BRANCH_MAUIKIT)
- ./mauikit/build.sh
- export BRANCH=$([ -z $BRANCH_INDEX ] && echo "master" || echo $BRANCH_INDEX)
- ./index/build.sh
#- ./build-apk.sh 'index-fm' 'https://invent.kde.org/maui/index-fm.git'
- export BRANCH=$([ -z $BRANCH_NOTA ] && echo "master" || echo $BRANCH_NOTA)
- ./nota/build.sh
#- ./build-apk.sh 'nota' 'https://invent.kde.org/maui/nota.git'
- export BRANCH=$([ -z $BRANCH_BUHO ] && echo "master" || echo $BRANCH_BUHO)
- ./buho/build.sh
#- ./build-apk.sh 'buho' 'https://invent.kde.org/maui/buho.git'
- export BRANCH=$([ -z $BRANCH_VVAVE ] && echo "master" || echo $BRANCH_VVAVE)
- ./vvave/build.sh
#- ./build-apk.sh 'vvave' 'https://invent.kde.org/maui/vvave.git'
#- export BRANCH=$([ -z $BRANCH_PIX ] && echo "master" || echo $BRANCH_PIX)
#- ./pix/build.sh
#- ./build-apk.sh 'pix' 'https://invent.kde.org/maui/maui-pix.git'
- export BRANCH=$([ -z $BRANCH_STATION ] && echo "master" || echo $BRANCH_STATION)
- ./station/build.sh
- export BRANCH=$([ -z $BRANCH_CONTACTS ] && echo "master" || echo $BRANCH_CONTACTS)
- ./communicator/build.sh
#- ./build-apk.sh 'communicator' 'https://invent.kde.org/maui/maui-dialer.git'
###
# END Stage builds-arm
###
......@@ -42,10 +42,8 @@ AppDir:
- qt5-image-formats-plugins
- qtwayland5
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
# - qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......
......@@ -22,29 +22,28 @@ AppDir:
arch: arm64
sources:
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/user bionic main'
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/dev/unstable focal main'
key_url: 'http://archive.neon.kde.org/public.key'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-security main restricted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted multiverse universe'
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
include:
# CORE DEPENDENCIES
- gettext
- libtag1v5
# BASIC QT DEPENDENCIES
- libqt5svg5
- libqt5sql5-sqlite
- libqt5webview5
- libqt5webengine5
- libtag1v5
- qt5-image-formats-plugins
- qtwayland5
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
- qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......@@ -55,6 +54,7 @@ AppDir:
- qml-module-qtqml-workerscript2
- qml-module-qtwebview
- qml-module-qt-labs-platform
- qml-module-qt-labs-settings
# KF5 DEPENDENCIES
- libkf5i18n5
......
......@@ -41,7 +41,6 @@ AppDir:
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
# - qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......
......@@ -4,11 +4,11 @@ AppDir:
path: ./AppDir
app_info:
id: org.mauikit.contacts
name: contacts
icon: contacts
id: org.mauikit.communicator
name: communicator
icon: communicator
version: !ENV ${APP_VERSION}
exec: usr/bin/contacts
exec: usr/bin/communicator
exec_args: $@
runtime:
......@@ -22,11 +22,11 @@ AppDir:
arch: arm64
sources:
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/user bionic main'
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/dev/unstable focal main'
key_url: 'http://archive.neon.kde.org/public.key'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-security main restricted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted multiverse universe'
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
- sourceline: 'deb [arch=arm64] http://ppa.launchpad.net/xorg-edgers/ppa/ubuntu xenial main'
key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x165d673674a995b3e64bf0cf4f191a5a8844c542'
......@@ -43,7 +43,6 @@ AppDir:
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
- qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......@@ -54,6 +53,7 @@ AppDir:
- qml-module-qtqml-workerscript2
- qml-module-qt-labs-platform
- qml-module-org-kde-people
- qml-module-qt-labs-settings
# KF5 DEPENDENCIES
- libkf5i18n5
......@@ -114,4 +114,4 @@ AppImage:
arch: "aarch64"
update-information: None
sign-key: None
file_name: !ENV 'contacts-${BUILD_TYPE}-${APP_VERSION}-git+${COMMIT_ID}-${TARGET_ARCH}.AppImage'
file_name: !ENV 'communicator-${BUILD_TYPE}-${APP_VERSION}-git+${COMMIT_ID}-${TARGET_ARCH}.AppImage'
......@@ -22,11 +22,11 @@ AppDir:
arch: arm64
sources:
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/user bionic main'
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/dev/unstable focal main'
key_url: 'http://archive.neon.kde.org/public.key'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-security main restricted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted multiverse universe'
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
- sourceline: 'deb [arch=arm64] http://ppa.launchpad.net/xorg-edgers/ppa/ubuntu xenial main'
key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x165d673674a995b3e64bf0cf4f191a5a8844c542'
......@@ -45,7 +45,6 @@ AppDir:
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
- qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......@@ -54,21 +53,20 @@ AppDir:
- qml-module-qtqml-models2
- qml-module-qtqml-statemachine
- qml-module-qtqml-workerscript2
- qml-module-qt-labs-settings
# KF5 DEPENDENCIES
- libkf5i18n5
- libkf5notifications5
- libkdecorations2-5v5
- libkdecorations2private7
- libkf5archive5
- qml-module-org-kde-purpose
- kio
- kio-extras
- libkf5plasma5
- libkf5plasmaquick5
# OKULAR
#- okular
#- qml-module-org-kde-okular
# MULTIMEDIA
- libqt5multimedia5-plugins
- libqt5multimediagsttools5
......@@ -79,7 +77,6 @@ AppDir:
- gstreamer1.0-plugins-good
- gstreamer1.0-plugins-bad
- gstreamer1.0-plugins-ugly
- gstreamer1.0-fluendo-mp3
- gstreamer1.0-pulseaudio
- libasound2-plugins
......
......@@ -45,7 +45,6 @@ AppDir:
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
# - qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......
......@@ -22,11 +22,11 @@ AppDir:
arch: arm64
sources:
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/user bionic main'
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/dev/unstable focal main'
key_url: 'http://archive.neon.kde.org/public.key'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-security main restricted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted multiverse universe'
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
- sourceline: 'deb [arch=arm64] http://ppa.launchpad.net/xorg-edgers/ppa/ubuntu xenial main'
key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x165d673674a995b3e64bf0cf4f191a5a8844c542'
......@@ -46,7 +46,6 @@ AppDir:
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
- qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......@@ -57,6 +56,7 @@ AppDir:
- qml-module-qtqml-workerscript2
- qml-module-qtwebview
- qml-module-qt-labs-platform
- qml-module-qt-labs-settings
# KF5 DEPENDENCIES
- libkf5i18n5
......
......@@ -44,7 +44,6 @@ AppDir:
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
# - qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......
......@@ -22,11 +22,11 @@ AppDir:
arch: arm64
sources:
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/user bionic main'
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/dev/unstable focal main'
key_url: 'http://archive.neon.kde.org/public.key'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-security main restricted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted multiverse universe'
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
- sourceline: 'deb [arch=arm64] http://ppa.launchpad.net/xorg-edgers/ppa/ubuntu xenial main'
key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x165d673674a995b3e64bf0cf4f191a5a8844c542'
......@@ -46,7 +46,6 @@ AppDir:
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
- qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......@@ -57,6 +56,7 @@ AppDir:
- qml-module-qtqml-workerscript2
- qml-module-qtwebview
- qml-module-qt-labs-platform
- qml-module-qt-labs-settings
# KF5 DEPENDENCIES
- libkf5i18n5
......
......@@ -41,7 +41,6 @@ AppDir:
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
#- qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......
......@@ -22,11 +22,11 @@ AppDir:
arch: arm64
sources:
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/user bionic main'
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/dev/unstable focal main'
key_url: 'http://archive.neon.kde.org/public.key'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-security main restricted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted multiverse universe'
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
- sourceline: 'deb [arch=arm64] http://ppa.launchpad.net/xorg-edgers/ppa/ubuntu xenial main'
key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x165d673674a995b3e64bf0cf4f191a5a8844c542'
......@@ -43,7 +43,6 @@ AppDir:
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
- qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......@@ -53,6 +52,7 @@ AppDir:
- qml-module-qtqml-statemachine
- qml-module-qtqml-workerscript2
- qml-module-qt-labs-platform
- qml-module-qt-labs-settings
# KF5 DEPENDENCIES
- libkf5i18n5
......
......@@ -43,7 +43,6 @@ AppDir:
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
# - qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......@@ -55,7 +54,6 @@ AppDir:
- qml-module-qtwebview
- qml-module-org-kde-kirigami2
- qml-module-qt-labs-settings
# KF5 DEPENDENCIES
- libkf5i18n5
......@@ -80,7 +78,6 @@ AppDir:
- gstreamer1.0-plugins-good
- gstreamer1.0-plugins-bad
- gstreamer1.0-plugins-ugly
# - gstreamer1.0-fluendo-mp3
- gstreamer1.0-pulseaudio
- libasound2-plugins
......
......@@ -22,11 +22,11 @@ AppDir:
arch: arm64
sources:
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/user bionic main'
- sourceline: 'deb [arch=arm64] http://archive.neon.kde.org/dev/unstable focal main'
key_url: 'http://archive.neon.kde.org/public.key'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-security main restricted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main resticted multiverse universe'
- sourceline: 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted multiverse universe'
key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
- sourceline: 'deb [arch=arm64] http://ppa.launchpad.net/xorg-edgers/ppa/ubuntu xenial main'
key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x165d673674a995b3e64bf0cf4f191a5a8844c542'
......@@ -39,14 +39,12 @@ AppDir:
- libqt5svg5
- libqt5sql5-sqlite
- libqt5webview5
- libqt5websockets5
- libtag1v5
- qt5-image-formats-plugins
- qtwayland5
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
- qml-module-qtquick-controls-styles-breeze
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
......@@ -56,9 +54,8 @@ AppDir:
- qml-module-qtqml-statemachine
- qml-module-qtqml-workerscript2
- qml-module-qtwebview
- qml-module-org-kde-kirigami
- qml-module-org-kde-kirigami2
- qml-module-qt-labs-settings
# KF5 DEPENDENCIES
- libkf5i18n5
......@@ -83,7 +80,6 @@ AppDir:
- gstreamer1.0-plugins-good
- gstreamer1.0-plugins-bad
- gstreamer1.0-plugins-ugly
- gstreamer1.0-fluendo-mp3
- gstreamer1.0-pulseaudio
- libasound2-plugins
......
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