Commit 7bacee04 authored by ab0027's avatar ab0027 💬
Browse files

Fix and enable arm64 builds

parent 84ecbebb
Pipeline #3633 failed with stages
in 19 minutes and 49 seconds
......@@ -109,36 +109,36 @@ builds-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 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_NXSC ] && echo "master" || echo $BRANCH_NXSC)
# - ./nx-sc/build.sh
# - export BRANCH=$([ -z $BRANCH_CLIP ] && echo "master" || echo $BRANCH_CLIP)
# - ./clip/build.sh
# - export BRANCH=$([ -z $BRANCH_SHELF ] && echo "master" || echo $BRANCH_SHELF)
# - ./shelf/build.sh
# - export BRANCH=$([ -z $BRANCH_COMMUNICATOR ] && echo "master" || echo $BRANCH_COMMUNICATOR)
# - ./communicator/build.sh
#- ./build-apk.sh 'communicator' 'https://invent.kde.org/maui/maui-dialer.git'
#- export BRANCH=$([ -z $BRANCH_STATION ] && echo "master" || echo $BRANCH_STATION)
#- ./station/build.sh
- export BRANCH=$([ -z $BRANCH_CLIP ] && echo "master" || echo $BRANCH_CLIP)
- ./clip/build.sh
- export BRANCH=$([ -z $BRANCH_SHELF ] && echo "master" || echo $BRANCH_SHELF)
- ./shelf/build.sh
- export BRANCH=$([ -z $BRANCH_COMMUNICATOR ] && echo "master" || echo $BRANCH_COMMUNICATOR)
- ./communicator/build.sh
# - ./build-apk.sh 'communicator' 'https://invent.kde.org/maui/maui-dialer.git'
- export BRANCH=$([ -z $BRANCH_STATION ] && echo "master" || echo $BRANCH_STATION)
- ./station/build.sh
###
# END Stage builds-arm
###
......@@ -17,7 +17,7 @@ build_cmake_project 'mauikit-texteditor-git' $SCRIPTPATH/../build $EXTRA_CMAKE_A
git_clone_or_update "$SCRIPTPATH/../build/mauikit-filebrowsing-git" 'https://invent.kde.org/maui/mauikit-filebrowsing.git' $BRANCH
build_cmake_project 'mauikit-filebrowsing-git' $SCRIPTPATH/../build $EXTRA_CMAKE_ARGS
git_clone_or_update "$SCRIPTPATH/../build/mauikit-imagetools-git" 'https://invent.kde.org/maui/mauikit-imagetools.git' $BRANCH
git_clone_or_update "$SCRIPTPATH/../build/mauikit-imagetools-git" 'https://invent.kde.org/maui/mauikit-imagetools.git' 'devel-fix-exiv2'
build_cmake_project 'mauikit-imagetools-git' $SCRIPTPATH/../build $EXTRA_CMAKE_ARGS
# $SCRIPTPATH/../build-deb.sh 'mauikit' 'https://invent.kde.org/maui/mauikit.git' $EXTRA_CMAKE_ARGS || true
......@@ -15,7 +15,7 @@ AppDir:
generator: wrapper
env:
PATH: '${APPDIR}/usr/bin:${APPDIR}/bin:${APPDIR}/usr/lib/aarch64-linux-gnu/libexec/kf5:${PATH}'
APPDIR_LIBRARY_PATH: "$APPDIR/lib/aarch64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/aarch64-linux-gnu:$APPDIR/usr/lib/aarch64-linux-gnu/pulseaudio:$APPDIR/usr/lib/aarch64-linux-gnu/qt5/qml/org/mauikit/imagetools:$APPDIR/usr/lib/aarch64-linux-gnu/qt5/qml/org/mauikit/filebrowsing""
APPDIR_LIBRARY_PATH: "$APPDIR/lib/aarch64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/aarch64-linux-gnu:$APPDIR/usr/lib/aarch64-linux-gnu/pulseaudio:$APPDIR/usr/lib/aarch64-linux-gnu/qt5/qml/org/mauikit/imagetools:$APPDIR/usr/lib/aarch64-linux-gnu/qt5/qml/org/mauikit/filebrowsing"
QT_QUICK_CONTROLS_STYLE: 'maui-style'
apt:
......
Supports Markdown
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