Commit 7215913e authored by ab0027's avatar ab0027 💬
Browse files

Fix builds

parent 87d7f784
Pipeline #3167 canceled with stages
in 12 minutes and 51 seconds
......@@ -37,9 +37,9 @@ after_script:
mc mb nx/maui/$BUILD_TYPE/vvave/$BRANCH_VVAVE/;
mc mb nx/maui/$BUILD_TYPE/pix/$BRANCH_PIX/;
mc mb nx/maui/$BUILD_TYPE/station/$BRANCH_STATION/;
mc mb nx/maui/$BUILD_TYPE/communicator/$BRANCH_COMMUNICATOR/;
mc mb nx/maui/$BUILD_TYPE/clip/$BRANCH_CLIP/;
mc mb nx/maui/$BUILD_TYPE/shelf/$BRANCH_SHELF/;
mc mb nx/maui/$BUILD_TYPE/communicator/$BRANCH_COMMUNICATOR/;
echo $BRANCH_MAUIKIT | mc pipe nx/maui/$BUILD_TYPE/mauikit/LATEST;
echo $BRANCH_INDEX | mc pipe nx/maui/$BUILD_TYPE/index/LATEST;
echo $BRANCH_NOTA | mc pipe nx/maui/$BUILD_TYPE/nota/LATEST;
......@@ -47,9 +47,9 @@ after_script:
echo $BRANCH_VVAVE | mc pipe nx/maui/$BUILD_TYPE/vvave/LATEST;
echo $BRANCH_PIX | mc pipe nx/maui/$BUILD_TYPE/pix/LATEST;
echo $BRANCH_STATION | mc pipe nx/maui/$BUILD_TYPE/station/LATEST;
echo $BRANCH_COMMUNICATOR | mc pipe nx/maui/$BUILD_TYPE/communicator/LATEST;
echo $BRANCH_CLIP | mc pipe nx/maui/$BUILD_TYPE/clip/LATEST;
echo $BRANCH_SHELF | mc pipe nx/maui/$BUILD_TYPE/shelf/LATEST;
echo $BRANCH_COMMUNICATOR | mc pipe nx/maui/$BUILD_TYPE/communicator/LATEST;
mc cp mauikit*${TARGET_ARCH}*.* nx/maui/$BUILD_TYPE/mauikit/$BRANCH_MAUIKIT/;
mc cp index*${TARGET_ARCH}*.* nx/maui/$BUILD_TYPE/index/$BRANCH_INDEX/;
mc cp nota*${TARGET_ARCH}*.* nx/maui/$BUILD_TYPE/nota/$BRANCH_NOTA/;
......@@ -57,9 +57,9 @@ after_script:
mc cp vvave*${TARGET_ARCH}*.* nx/maui/$BUILD_TYPE/vvave/$BRANCH_VVAVE/;
mc cp pix*${TARGET_ARCH}*.* nx/maui/$BUILD_TYPE/pix/$BRANCH_PIX/;
mc cp station*${TARGET_ARCH}*.* nx/maui/$BUILD_TYPE/station/$BRANCH_STATION/;
mc cp communicator*${TARGET_ARCH}*.* nx/maui/$BUILD_TYPE/communicator/$BRANCH_COMMUNICATOR/;
mc cp clip*${TARGET_ARCH}*.* nx/maui/$BUILD_TYPE/clip/$BRANCH_CLIP/;
mc cp shelf*${TARGET_ARCH}*.* nx/maui/$BUILD_TYPE/shelf/$BRANCH_SHELF/;
mc cp communicator*${TARGET_ARCH}*.* nx/maui/$BUILD_TYPE/communicator/$BRANCH_COMMUNICATOR/;
fi
### Grouped builds together to reduce build time
......@@ -90,12 +90,12 @@ builds-amd64:
- ./station/build.sh
- export BRANCH=$([ -z $BRANCH_NXSC ] && echo "master" || echo $BRANCH_NXSC)
- ./nx-sc/build.sh
#- export BRANCH=$([ -z $BRANCH_COMMUNICATOR ] && echo "master" || echo $BRANCH_COMMUNICATOR)
#- ./communicator/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
###
# END Stage builds-amd64
###
......@@ -132,13 +132,13 @@ builds-arm64:
- ./station/build.sh
- export BRANCH=$([ -z $BRANCH_NXSC ] && echo "master" || echo $BRANCH_NXSC)
- ./nx-sc/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_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'
###
# END Stage builds-arm
###
......@@ -21,7 +21,7 @@ ln -s ./hicolor "$APPDIR"/usr/share/icons/breeze
deploy_deb_packages "$APPDIR" mauikit-git qml-module-org-kde-kirigami2 clip-git
export COMMIT_ID=$(cd $SCRIPTPATH/../build/pix-git && git rev-parse --short HEAD)
export COMMIT_ID=$(cd $SCRIPTPATH/../build/clip-git && git rev-parse --short HEAD)
# workaround libcrypt.so.2 binary still name as libcrypt.so.1 in debian systems
(
......@@ -33,7 +33,7 @@ export COMMIT_ID=$(cd $SCRIPTPATH/../build/pix-git && git rev-parse --short HEAD
ln -s ../../../opt/libc/lib/aarch64-linux-gnu/libcrypt.so.1 ./libcrypt.so.1
fi
)
appimage-builder --skip-tests --recipe $SCRIPTPATH/appimage-${TARGET_ARCH}.yml
#$SCRIPTPATH/../build-deb.sh 'clip' 'https://invent.kde.org/maui/clip.git' $EXTRA_CMAKE_ARGS || true
appimage-builder --log error --skip-tests --recipe $SCRIPTPATH/appimage-${TARGET_ARCH}.yml
$SCRIPTPATH/../build-deb.sh 'clip' 'https://invent.kde.org/maui/clip.git' $EXTRA_CMAKE_ARGS || true
$sudo rm -rf ./AppDir ./appimage-builder-cache
......@@ -21,9 +21,9 @@ ln -s ./hicolor "$APPDIR"/usr/share/icons/breeze
deploy_deb_packages "$APPDIR" mauikit-git qml-module-org-kde-kirigami2 shelf-git
export COMMIT_ID=$(cd $SCRIPTPATH/../build/pix-git && git rev-parse --short HEAD)
export COMMIT_ID=$(cd $SCRIPTPATH/../build/shelf-git && git rev-parse --short HEAD)
appimage-builder --skip-tests --recipe $SCRIPTPATH/appimage-${TARGET_ARCH}.yml
#$SCRIPTPATH/../build-deb.sh 'shelf' 'https://invent.kde.org/maui/shelf.git' $EXTRA_CMAKE_ARGS || true
appimage-builder --log error --skip-tests --recipe $SCRIPTPATH/appimage-${TARGET_ARCH}.yml
$SCRIPTPATH/../build-deb.sh 'shelf' 'https://invent.kde.org/maui/shelf.git' $EXTRA_CMAKE_ARGS || true
$sudo rm -rf ./AppDir ./appimage-builder-cache
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