Commit 8256c839 authored by probal31's avatar probal31
Browse files

Changes:

- Use updated mauikit docker image in build
- Fixed and removed packages for maui apps
parent dfa04334
Pipeline #4241 canceled with stage
in 9 minutes and 32 seconds
......@@ -74,11 +74,13 @@ after_script:
fi
builds-amd64:
image: mauikit/ubuntu-20.04-amd64:20211001
image: mauikit/ubuntu-20.04-amd64:20211025
stage: build
script:
- rm -rf ./build/
- export TARGET_ARCH="amd64"
- export BRANCH=$([ -z $BRANCH_KIRIGAMI ] && echo "master" || echo $BRANCH_KIRIGAMI)
- ./kirigami/build.sh
- export BRANCH=$([ -z $BRANCH_MAUIKIT ] && echo "master" || echo $BRANCH_MAUIKIT)
- ./mauikit/build.sh
- export BRANCH=$([ -z $BRANCH_INDEX ] && echo "master" || echo $BRANCH_INDEX)
......@@ -109,6 +111,8 @@ build-arm64:
script:
- rm -rf ./build/
- export TARGET_ARCH="arm64"
#- export BRANCH=$([ -z $BRANCH_KIRIGAMI ] && echo "master" || echo $BRANCH_KIRIGAMI)
#- ./kirigami/build.sh
- export BRANCH=$([ -z $BRANCH_MAUIKIT ] && echo "master" || echo $BRANCH_MAUIKIT)
- ./mauikit/build.sh
- export BRANCH=$([ -z $BRANCH_INDEX ] && echo "master" || echo $BRANCH_INDEX)
......
......@@ -12,7 +12,7 @@ AppDir:
exec_args: $@
runtime:
generator: wrapper
# generator: wrapper
env:
PATH: '${APPDIR}/usr/bin:${APPDIR}/bin:${APPDIR}/usr/lib/x86_64-linux-gnu/libexec/kf5:${PATH}'
APPDIR_LIBRARY_PATH: "$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/filebrowsing:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/texteditor"
......@@ -37,37 +37,37 @@ AppDir:
# BASIC QT DEPENDENCIES
- libqt5svg5
- libqt5sql5-sqlite
- libqt5webview5
- libqt5webengine5
- qt5-image-formats-plugins
- qtwayland5
# - libqt5webview5
# - libqt5webengine5
# - qt5-image-formats-plugins
# - qtwayland5
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
# - qml-module-qtquick-controls
# - qml-module-qtquick-controls2
# - qml-module-qtquick-dialogs
# - qml-module-qtquick-layouts
- qml-module-qtquick-shapes
- qml-module-qtquick2
- qml-module-qtqml-models2
- qml-module-qtqml-statemachine
- qml-module-qtqml-workerscript2
- qml-module-qtwebview
- qml-module-qt-labs-platform
# - qml-module-qtqml-statemachine
# - qml-module-qtqml-workerscript2
# - qml-module-qtwebview
# - qml-module-qt-labs-platform
- qml-module-qt-labs-settings
# KF5 DEPENDENCIES
- libkf5i18n5
- libkf5notifications5
- libkf5configcore5
- libkf5configgui5
- libkf5configwidgets5
- libkdecorations2-5v5
- libkdecorations2private7
- kio
- kio-extras
- libkf5plasma5
- libkf5plasmaquick5
# - libkf5i18n5
# - libkf5notifications5
# - libkf5configcore5
# - libkf5configgui5
# - libkf5configwidgets5
# # - libkdecorations2-5v5
# # - libkdecorations2private7
# - kio
# - kio-extras
# - libkf5plasma5
# - libkf5plasmaquick5
- qml-module-org-kde-kirigami2
exclude:
......
......@@ -12,7 +12,7 @@ AppDir:
exec_args: $@
runtime:
generator: wrapper
# generator: wrapper
env:
PATH: '${APPDIR}/usr/bin:${APPDIR}/bin:${APPDIR}/usr/lib/x86_64-linux-gnu/libexec/kf5:${PATH}'
APPDIR_LIBRARY_PATH: "$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio:$APPDIR/usr/lib/x86_64-linux-gnu/samba"
......@@ -36,34 +36,34 @@ AppDir:
# BASIC QT DEPENDENCIES
- libqt5svg5
- libqt5sql5-sqlite
- qtwayland5
# - qtwayland5
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
# - qml-module-qtquick-dialogs
# - qml-module-qtquick-layouts
- qml-module-qtquick-shapes
- qml-module-qtquick2
- qml-module-qtqml-models2
- qml-module-qtqml-statemachine
- qml-module-qtqml-workerscript2
- qml-module-qt-labs-platform
# - qml-module-qtqml-models2
# - qml-module-qtqml-statemachine
# - qml-module-qtqml-workerscript2
# - qml-module-qt-labs-platform
- qml-module-qt-labs-settings
- qml-module-qtmultimedia
# KF5 DEPENDENCIES
- libkf5i18n5
- libkf5notifications5
- libkf5configcore5
- libkf5configgui5
- libkf5configwidgets5
- libkdecorations2-5v5
- libkdecorations2private7
# - libkf5configcore5
# - libkf5configgui5
# - libkf5configwidgets5
# - libkdecorations2-5v5
# - libkdecorations2private7
- kio
- kio-extras
- libkf5plasma5
- libkf5plasmaquick5
# - kio-extras
# - libkf5plasma5
# - libkf5plasmaquick5
- qml-module-org-kde-kirigami2
# OTHER DEPENDENCIES
......
......@@ -12,7 +12,7 @@ AppDir:
exec_args: $@
runtime:
generator: wrapper
# generator: wrapper
env:
PATH: '${APPDIR}/usr/bin:${APPDIR}/bin:${APPDIR}/usr/lib/x86_64-linux-gnu/libexec/kf5:${PATH}'
APPDIR_LIBRARY_PATH: "$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/filebrowsing:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/texteditor"
......@@ -36,8 +36,8 @@ AppDir:
# BASIC QT DEPENDENCIES
- libqt5svg5
- libqt5sql5-sqlite
- qt5-image-formats-plugins
- qtwayland5
# - qt5-image-formats-plugins
# - qtwayland5
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
......@@ -60,12 +60,12 @@ AppDir:
- libkf5configgui5
- libkf5configwidgets5
- libkf5contacts5
- libkdecorations2-5v5
- libkdecorations2private7
# - libkdecorations2-5v5
# - libkdecorations2private7
- kio
- kio-extras
- libkf5plasma5
- libkf5plasmaquick5
# - kio-extras
# - libkf5plasma5
# - libkf5plasmaquick5
- qml-module-org-kde-kirigami2
# Other
......
......@@ -12,7 +12,7 @@ AppDir:
exec_args: $@
runtime:
generator: wrapper
# generator: wrapper
env:
PATH: '${APPDIR}/usr/bin:${APPDIR}/bin:${APPDIR}/usr/lib/x86_64-linux-gnu/libexec/kf5:${PATH}'
APPDIR_LIBRARY_PATH: "$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/imagetools:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/texteditor:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/filebrowsing"
......@@ -39,19 +39,19 @@ AppDir:
- libqt5sql5-sqlite
- libtag1v5
- qt5-image-formats-plugins
- qtwayland5
# - 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
# - qml-module-qtquick-dialogs
# - qml-module-qtquick-layouts
- qml-module-qtquick-shapes
- qml-module-qtquick2
- qml-module-qtqml-models2
- qml-module-qtqml-statemachine
- qml-module-qtqml-workerscript2
# - qml-module-qtquick2
# - qml-module-qtqml-models2
# - qml-module-qtqml-statemachine
# - qml-module-qtqml-workerscript2
- qml-module-qt-labs-settings
- qml-module-qt-labs-platform
- qml-module-qmltermwidget
......@@ -59,8 +59,8 @@ AppDir:
# KF5 DEPENDENCIES
- libkf5i18n5
- libkf5notifications5
- libkdecorations2-5v5
- libkdecorations2private7
# - libkdecorations2-5v5
# - libkdecorations2private7
- libkf5archive5
- qml-module-org-kde-purpose
- kio
......@@ -79,10 +79,10 @@ AppDir:
- qml-module-qtmultimedia
- gstreamer1.0-x
- gstreamer1.0-alsa
- gstreamer1.0-plugins-base
- gstreamer1.0-plugins-good
- gstreamer1.0-plugins-bad
- gstreamer1.0-plugins-ugly
# - gstreamer1.0-plugins-base
# - gstreamer1.0-plugins-good
# - gstreamer1.0-plugins-bad
# - gstreamer1.0-plugins-ugly
# - gstreamer1.0-fluendo-mp3
- gstreamer1.0-pulseaudio
- libasound2-plugins
......
......@@ -12,7 +12,7 @@ AppDir:
exec_args: $@
runtime:
generator: wrapper
# generator: wrapper
env:
PATH: '${APPDIR}/usr/bin:${APPDIR}/bin:${APPDIR}/usr/lib/x86_64-linux-gnu/libexec/kf5:${PATH}'
APPDIR_LIBRARY_PATH: "$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/texteditor:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/filebrowsing"
......@@ -37,11 +37,11 @@ AppDir:
# BASIC QT DEPENDENCIES
- libqt5svg5
- libqt5sql5-sqlite
- libqt5webview5
- libqt5webengine5
# - libqt5webview5
# - libqt5webengine5
- libtag1v5
- qt5-image-formats-plugins
- qtwayland5
# - qt5-image-formats-plugins
# - qtwayland5
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
......@@ -51,25 +51,26 @@ AppDir:
- qml-module-qtquick-shapes
- qml-module-qtquick2
- qml-module-qtqml-models2
- qml-module-qtqml-statemachine
- qml-module-qtqml-workerscript2
- qml-module-qtwebview
- qml-module-qt-labs-platform
# - qml-module-qtqml-statemachine
# - qml-module-qtqml-workerscript2
# - qml-module-qtwebview
# - qml-module-qt-labs-platform
- qml-module-qt-labs-settings
- qml-module-qmltermwidget
# KF5 DEPENDENCIES
- libkf5i18n5
- libkf5notifications5
- libkf5configcore5
- libkf5configgui5
- libkf5configwidgets5
- libkdecorations2-5v5
- libkdecorations2private7
# - libkf5notifications5
# - libkf5configcore5
# - libkf5configgui5
# - libkf5configwidgets5
# - libkdecorations2-5v5
# - libkdecorations2private7
- kio
- kio-extras
- libkf5plasma5
- libkf5plasmaquick5
# - kio-extras
# - libkf5kiofilewidgets5
# - libkf5plasma5
# - libkf5plasmaquick5
- qml-module-org-kde-kirigami2
exclude:
......
......@@ -12,7 +12,7 @@ AppDir:
exec_args: $@
runtime:
generator: wrapper
# generator: wrapper
env:
PATH: '${APPDIR}/usr/bin:${APPDIR}/bin:${APPDIR}/usr/lib/x86_64-linux-gnu/libexec/kf5:${PATH}'
APPDIR_LIBRARY_PATH: "$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/imagetools:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/filebrowsing"
......@@ -36,11 +36,11 @@ AppDir:
# BASIC QT DEPENDENCIES
- libqt5svg5
- libqt5sql5-sqlite
- libqt5webview5
- libqt5webengine5
# - libqt5webview5
# - libqt5webengine5
- libtag1v5
- qt5-image-formats-plugins
- qtwayland5
# - qt5-image-formats-plugins
# - qtwayland5
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
......@@ -50,11 +50,11 @@ AppDir:
- qml-module-qtquick-layouts
- qml-module-qtquick-shapes
- qml-module-qtquick2
- qml-module-qtqml-models2
- qml-module-qtqml-statemachine
- qml-module-qtqml-workerscript2
- qml-module-qtwebview
- qml-module-qt-labs-platform
# - qml-module-qtqml-models2
# - qml-module-qtqml-statemachine
# - qml-module-qtqml-workerscript2
# - qml-module-qtwebview
# - qml-module-qt-labs-platform
- qml-module-qt-labs-settings
- qml-module-qtpositioning
- qml-module-qtlocation
......@@ -62,15 +62,15 @@ AppDir:
# KF5 DEPENDENCIES
- libkf5i18n5
- libkf5notifications5
- libkf5configcore5
- libkf5configgui5
- libkf5configwidgets5
- libkdecorations2-5v5
- libkdecorations2private7
# - libkf5configcore5
# - libkf5configgui5
# - libkf5configwidgets5
# - libkdecorations2-5v5
# - libkdecorations2private7
- kio
- kio-extras
- libkf5plasma5
- libkf5plasmaquick5
# - kio-extras
# - libkf5plasma5
# - libkf5plasmaquick5
- qml-module-org-kde-kquickimageeditor
- qml-module-org-kde-kirigami2
......
......@@ -12,7 +12,7 @@ AppDir:
exec_args: $@
runtime:
generator: wrapper
# generator: wrapper
env:
PATH: '${APPDIR}/usr/bin:${APPDIR}/bin:${APPDIR}/usr/lib/x86_64-linux-gnu/libexec/kf5:${PATH}'
APPDIR_LIBRARY_PATH: "$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/texteditor:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/filebrowsing"
......@@ -36,34 +36,34 @@ AppDir:
# BASIC QT DEPENDENCIES
- libqt5svg5
- libqt5sql5-sqlite
- qtwayland5
# - qtwayland5
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
# - qml-module-qtquick-dialogs
# - qml-module-qtquick-layouts
- qml-module-qtquick-shapes
- qml-module-qtquick2
- qml-module-qtqml-models2
- qml-module-qtqml-statemachine
- qml-module-qtqml-workerscript2
- qml-module-qt-labs-platform
# - qml-module-qtqml-models2
# - qml-module-qtqml-statemachine
# - qml-module-qtqml-workerscript2
# - qml-module-qt-labs-platform
- qml-module-qt-labs-settings
- qml-module-qtmultimedia
# - qml-module-qtmultimedia
# KF5 DEPENDENCIES
- libkf5i18n5
- libkf5notifications5
- libkf5configcore5
- libkf5configgui5
- libkf5configwidgets5
- libkdecorations2-5v5
- libkdecorations2private7
# - libkf5configcore5
# - libkf5configgui5
# - libkf5configwidgets5
# - libkdecorations2-5v5
# - libkdecorations2private7
- kio
- kio-extras
- libkf5plasma5
- libkf5plasmaquick5
# - libkf5plasma5
# - libkf5plasmaquick5
- qml-module-org-kde-kirigami2
# OTHER DEPENDENCIES
......
......@@ -12,7 +12,7 @@ AppDir:
exec_args: $@
runtime:
generator: wrapper
# generator: wrapper
env:
PATH: '${APPDIR}/usr/bin:${APPDIR}/bin:${APPDIR}/usr/lib/x86_64-linux-gnu/libexec/kf5:${PATH}'
APPDIR_LIBRARY_PATH: "$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio"
......@@ -61,8 +61,8 @@ AppDir:
- libkf5configwidgets5
- libkf5kiofilewidgets5
- libkf5syntaxhighlighting5
- libkdecorations2-5v5
- libkdecorations2private7
# - libkdecorations2-5v5
# - libkdecorations2private7
- libkf5plasma5
- libkf5plasmaquick5
- qml-module-org-kde-kirigami2
......
......@@ -12,12 +12,14 @@ AppDir:
exec_args: $@
runtime:
generator: wrapper
# generator: wrapper
env:
PATH: '${APPDIR}/usr/bin:${APPDIR}/bin:${APPDIR}/usr/lib/x86_64-linux-gnu/libexec/kf5:${PATH}'
APPDIR_LIBRARY_PATH: "$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu/pulseaudio:$APPDIR/usr/lib/x86_64-linux-gnu/qt5/qml/org/mauikit/filebrowsing"
QT_QUICK_CONTROLS_STYLE: 'maui-style'
after_bundle:
- rm -rf $APPDIR/usr/share/doc
- rm -rf $APPDIR/usr/share/locale
apt:
arch: amd64
......@@ -31,53 +33,58 @@ AppDir:
include:
# CORE DEPENDENCIES
- gettext
#- gettext
# BASIC QT DEPENDENCIES
- libqt5svg5
#- libqt5svg5
- libqt5sql5-sqlite
- libqt5webview5
- libtag1v5
- qt5-image-formats-plugins
- qtwayland5
# - libqt5webview5
#- libtag1v5
# - qt5-image-formats-plugins
#- qtwayland5
# QT QUICK DEPENDENCIES
- qml-module-qtquick-controls
- qml-module-qtquick-controls2
- qml-module-qtquick-dialogs
- qml-module-qtquick-layouts
#- qml-module-qtquick-controls
# - qml-module-qtquick-controls2
#- qml-module-qtquick-dialogs
#- qml-module-qtquick-layouts
- qml-module-qtquick-shapes
- qml-module-qtquick2
- qml-module-qtqml-models2
- qml-module-qtqml-statemachine
- qml-module-qtqml-workerscript2
- qml-module-qtwebview
#- qml-module-qtqml-models2
# - qml-module-qtqml-statemachine
# - qml-module-qtqml-workerscript2
# - qml-module-qtwebview
- qml-module-qt-labs-settings
# KF5 DEPENDENCIES
- libkf5i18n5
- libkf5notifications5
- libkf5configcore5
- libkf5configgui5
- libkf5configwidgets5
- libkdecorations2-5v5
- libkdecorations2private7
#- libkf5i18n5
# - libkf5notifications5
#- libkf5configcore5
#- libkf5configgui5
#- libkf5configwidgets5
#- libkdecorations2-5v5
#- libkdecorations2private7
- kio
- kio-extras
- libkf5plasma5
- libkf5plasmaquick5
- qml-module-org-kde-kirigami2
- libkf5kiofilewidgets5
#- kio-extras
#- libkf5plasma5
#- libkf5plasmaquick5
# - qml-module-org-kde-kirigami2
- libqt5quickcontrols2-5
- qml-module-qtquick-controls2
- qml-module-qtquick-controls
- qml-module-qtquick2
# MULTIMEDIA
- libqt5multimedia5-plugins
- libqt5multimediagsttools5
- qml-module-qtmultimedia
- gstreamer1.0-x
# - gstreamer1.0-x
- gstreamer1.0-alsa
- gstreamer1.0-plugins-base
#- gstreamer1.0-plugins-base
- gstreamer1.0-plugins-good
- gstreamer1.0-plugins-bad
- gstreamer1.0-plugins-ugly
#- gstreamer1.0-plugins-bad
#- gstreamer1.0-plugins-ugly
- 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