From 9386a3ea0e11b03ae07b0f8394477487c3b145e2 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 1 Oct 2026 11:07:39 +0200 Subject: [PATCH 1/2] chore: put back docker images for our stable-34.0 branch Signed-off-by: Matthieu Gallien --- client-appimage-qt6/Dockerfile.build.el8 | 63 +++++++++++++++++ client-appimage-qt6/Dockerfile.el8 | 66 ++++++++++++++++++ .../craftmaster-34.0-cache.ini | 64 +++++++++++++++++ client-appimage-qt6/craftmaster-34.0.ini | 68 +++++++++++++++++++ 4 files changed, 261 insertions(+) create mode 100644 client-appimage-qt6/Dockerfile.build.el8 create mode 100644 client-appimage-qt6/Dockerfile.el8 create mode 100644 client-appimage-qt6/craftmaster-34.0-cache.ini create mode 100644 client-appimage-qt6/craftmaster-34.0.ini diff --git a/client-appimage-qt6/Dockerfile.build.el8 b/client-appimage-qt6/Dockerfile.build.el8 new file mode 100644 index 00000000..c25ef6d4 --- /dev/null +++ b/client-appimage-qt6/Dockerfile.build.el8 @@ -0,0 +1,63 @@ +FROM almalinux:8.10 + +MAINTAINER Desktop Team + +RUN dnf update -y && \ + dnf install -y epel-release && \ + dnf config-manager --set-enabled powertools && \ + dnf update -y && \ + dnf install -y \ + xz \ + gcc-toolset-14 \ + gcc-toolset-14-libatomic-devel \ + git-core \ + patch \ + python3.11 \ + python3.11-pip \ + at-spi2-atk-devel \ + mesa-vulkan-drivers \ + vulkan-headers \ + wayland-devel \ + mesa-libGL-devel \ + libX11-devel \ + libX11-xcb \ + libxcb-devel \ + libxkbcommon-devel \ + libxkbcommon-x11 \ + libXi-devel \ + libXcomposite-devel \ + libXcursor-devel \ + libXrandr-devel \ + libXtst-devel \ + xcb-util-devel \ + xcb-util-cursor \ + xcb-util-cursor-devel \ + xcb-util-keysyms \ + xcb-util-keysyms-devel \ + xcb-util-renderutil \ + xcb-util-renderutil-devel \ + xcb-util-wm \ + xcb-util-wm-devel \ + xcb-util-image \ + xcb-util-image-devel \ + libxkbcommon-x11-devel \ + xorg-x11-util-macros + +########################################################################### + +# Install craftmaster +RUN \ + cd /root && \ + git clone https://invent.kde.org/packaging/craftmaster.git \ + ; + +ADD craftmaster-34.0.ini /root/craftmaster.ini + +# Install binary dependencies +RUN \ + scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3.11 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-34.0|" && \ + scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3.11 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-nextcloud.git|stable-34.0|" && \ + scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3.11 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c craft && \ + scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3.11 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --install-deps nextcloud-client && \ + rm -rf /root/linux-gcc-x86_64/build \ + ; diff --git a/client-appimage-qt6/Dockerfile.el8 b/client-appimage-qt6/Dockerfile.el8 new file mode 100644 index 00000000..8e48cbd3 --- /dev/null +++ b/client-appimage-qt6/Dockerfile.el8 @@ -0,0 +1,66 @@ +FROM almalinux:8.10 + +MAINTAINER Desktop Team + +RUN dnf update -y && \ + dnf install -y epel-release && \ + dnf config-manager --set-enabled powertools && \ + dnf update -y && \ + dnf install -y \ + xz \ + gcc-toolset-14 \ + gcc-toolset-14-libatomic-devel \ + git-core \ + patch \ + python3.11 \ + python3.11-pip \ + at-spi2-atk-devel \ + mesa-vulkan-drivers \ + vulkan-headers \ + wayland-devel \ + mesa-libGL-devel \ + libX11-devel \ + libX11-xcb \ + libxcb-devel \ + libxkbcommon-devel \ + libxkbcommon-x11 \ + libXi-devel \ + libXcomposite-devel \ + libXcursor-devel \ + libXrandr-devel \ + libXtst-devel \ + xcb-util-devel \ + xcb-util-cursor \ + xcb-util-cursor-devel \ + xcb-util-keysyms \ + xcb-util-keysyms-devel \ + xcb-util-renderutil \ + xcb-util-renderutil-devel \ + xcb-util-wm \ + xcb-util-wm-devel \ + xcb-util-image \ + xcb-util-image-devel \ + libxkbcommon-x11-devel \ + xorg-x11-util-macros \ + wget \ + inkscape \ + file + +########################################################################### + +# Install craftmaster +RUN \ + cd /root && \ + git clone https://invent.kde.org/packaging/craftmaster.git \ + ; + +ADD craftmaster-34.0-cache.ini /root/craftmaster.ini + +# Install binary dependencies +RUN \ + scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3.11 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-34.0|" && \ + scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3.11 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-nextcloud.git|stable-34.0|" && \ + scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3.11 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c craft && \ + scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3.11 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --install-deps nextcloud-client && \ + rm -rf /root/linux-gcc-x86_64/build \ + ; diff --git a/client-appimage-qt6/craftmaster-34.0-cache.ini b/client-appimage-qt6/craftmaster-34.0-cache.ini new file mode 100644 index 00000000..f13b52fa --- /dev/null +++ b/client-appimage-qt6/craftmaster-34.0-cache.ini @@ -0,0 +1,64 @@ +# SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: GPL-2.0-or-later +[General] +Branch = stable-34.0-qt-6.10.2 +CraftUrl = https://github.com/nextcloud/craft.git +CraftRevision = 2661a4e055f1e077548adf3ba050a4699837e574 +ShallowClone = False + +# Variables defined here override the default value +# The variable names are casesensitive +[Variables] + +# Settings applicable for all Crafts matrices +# Settings are Category/key=value +# Category is case sensitive +[GeneralSettings] + +General/MacDeploymentTarget = 13.0 + +Compile/BuildType = RelWithDebInfo + +Compile/UseNinja = True + +ShortPath/Enabled = False +ShortPath/EnableJunctions = False + +Packager/RepositoryUrl = https://download.nextcloud.com/desktop/development/craftCache/ +Packager/CacheVersion = stable-34.0-qt-6.10.2 +ContinuousIntegration/Enabled = True + +Packager/UseCache = True +Packager/CreateCache = False + +[BlueprintSettings] +nextcloud-client.buildTests = True +nextcloud-client.buildWithWebEngine = False +binary/mysql.useMariaDB = False +libs/qt6.version = 6.10.2 +craft/craft-blueprints-kde.revision = stable-34.0 +craft/craft-blueprints-nextcloud.revision = stable-34.0 + +[windows-msvc2022_64-cl] +Packager/PackageType = NullsoftInstallerPackager +QtSDK/Compiler = msvc2022_64 +General/ABI = windows-msvc2022_64-cl +Paths/Python = C:\Python312-x64 + +[macos-64-clang] +General/ABI = macos-64-clang + +[macos-clang-arm64] +General/ABI = macos-clang-arm64 +Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64 + +[linux-gcc-x86_64] +General/ABI = linux-gcc-x86_64 + +[Env] +CRAFT_CODESIGN_CERTIFICATE = +SIGN_PACKAGE = False + +[Custom_Variables_for_Brander] +qtPath = /root/linux-gcc-x86_64 +dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.10.2-4 diff --git a/client-appimage-qt6/craftmaster-34.0.ini b/client-appimage-qt6/craftmaster-34.0.ini new file mode 100644 index 00000000..b086e8d9 --- /dev/null +++ b/client-appimage-qt6/craftmaster-34.0.ini @@ -0,0 +1,68 @@ +# SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: GPL-2.0-or-later +[General] +Branch = stable-34.0-qt-6.10.2 +CraftUrl = https://github.com/nextcloud/craft.git +CraftRevision = 2661a4e055f1e077548adf3ba050a4699837e574 +ShallowClone = False + +# Variables defined here override the default value +# The variable names are casesensitive +[Variables] + +# Settings applicable for all Crafts matrices +# Settings are Category/key=value +# Category is case sensitive +[GeneralSettings] + +General/MacDeploymentTarget = 13.0 + +Compile/BuildType = RelWithDebInfo + +Compile/UseNinja = True + +ShortPath/Enabled = False +ShortPath/EnableJunctions = False + +Packager/RepositoryUrl = https://download.nextcloud.com/desktop/development/craftCache/ +Packager/CacheVersion = stable-34.0-qt-6.10.2 + +# set this to `true` if you want to update an existing Craft cache +ContinuousIntegration/UpdateRepository = True +ContinuousIntegration/Enabled = True +Packager/UseCache = True +Packager/CreateCache = True + +Packager/CacheDir = /root/stable-34.0-qt-6.10.2 + +[BlueprintSettings] +nextcloud-client.buildTests = True +nextcloud-client.buildWithWebEngine = False +binary/mysql.useMariaDB = False +libs/qt6.version = 6.10.2 +craft/craft-blueprints-kde.revision = stable-34.0 +craft/craft-blueprints-nextcloud.revision = stable-34.0 + +[windows-msvc2022_64-cl] +Packager/PackageType = NullsoftInstallerPackager +QtSDK/Compiler = msvc2022_64 +General/ABI = windows-msvc2022_64-cl +Paths/Python = C:\Python312-x64 + +[macos-64-clang] +General/ABI = macos-64-clang + +[macos-clang-arm64] +General/ABI = macos-clang-arm64 +Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64 + +[linux-gcc-x86_64] +General/ABI = linux-gcc-x86_64 + +[Env] +CRAFT_CODESIGN_CERTIFICATE = +SIGN_PACKAGE = False + +[Custom_Variables_for_Brander] +qtPath = /root/linux-gcc-x86_64 +dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.10.2-4 From 98bb515ae160e00db91c11e56be0115bb32362de Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 1 Oct 2026 11:08:18 +0200 Subject: [PATCH 2/2] chore: clean up obsolete files Signed-off-by: Matthieu Gallien --- .../Dockerfile-stable-33.0.el8 | 144 ---------------- .../Dockerfile.build.qt-6.9.3.el8 | 158 ------------------ .../craftmaster-stable-33.0.ini | 72 -------- client-appimage-qt6/craftmaster.qt-6.9.3.ini | 71 -------- 4 files changed, 445 deletions(-) delete mode 100644 client-appimage-qt6/Dockerfile-stable-33.0.el8 delete mode 100644 client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8 delete mode 100644 client-appimage-qt6/craftmaster-stable-33.0.ini delete mode 100644 client-appimage-qt6/craftmaster.qt-6.9.3.ini diff --git a/client-appimage-qt6/Dockerfile-stable-33.0.el8 b/client-appimage-qt6/Dockerfile-stable-33.0.el8 deleted file mode 100644 index bccd6302..00000000 --- a/client-appimage-qt6/Dockerfile-stable-33.0.el8 +++ /dev/null @@ -1,144 +0,0 @@ -FROM almalinux/8-base - -MAINTAINER Desktop Team - -# Run 'docker build' with '--build-arg BUILD_QT=1' to build Qt from source (default: not set) -ARG BUILD_QT - -RUN dnf update -y && \ - dnf install -y epel-release && \ - dnf config-manager --set-enabled powertools && \ - dnf update -y && \ - dnf install -y \ - '@Development Tools' \ - alsa-lib-devel \ - at-spi2-core-devel \ - clang \ - clang-devel \ - cmake \ - cups-devel \ - curl \ - dbus-devel \ - dbus-x11 \ - desktop-file-utils \ - expat-devel \ - fontconfig-devel \ - freetype-devel \ - gcc-toolset-14 \ - gcc-toolset-14-libatomic-devel \ - git \ - glib2-devel \ - glx-utils \ - gperf \ - gstreamer1-devel \ - gstreamer1-plugins-bad-free-devel \ - gstreamer1-plugins-base-devel \ - gtk3-devel \ - harfbuzz-devel \ - inkscape \ - jsoncpp-devel \ - lcms2-devel \ - libICE-devel \ - libSM-devel \ - libX11-devel \ - libXScrnSaver-devel \ - libXcomposite-devel \ - libXcursor-devel \ - libXdamage-devel \ - libXext-devel \ - libXfixes-devel \ - libXi-devel \ - libXinerama-devel \ - libXrandr-devel \ - libXrender-devel \ - libXtst-devel \ - libXv-devel \ - libcap-devel \ - libcmocka-devel \ - libdrm-devel \ - libevent-devel \ - libglvnd-devel \ - libinput-devel \ - libjpeg-turbo-devel \ - libmng-devel \ - libpng-devel \ - libpq-devel \ - libproxy-devel \ - libsecret-devel \ - libselinux-devel \ - libmount-devel \ - file \ - glib2-devel \ - wget \ - inkscape \ - libstdc++-static \ - libtiff-devel \ - libwebp-devel \ - libxcb-devel \ - libxkbcommon-devel \ - libxkbcommon-x11-devel \ - libxkbfile-devel \ - libxshmfence-devel \ - llvm-devel \ - mariadb-connector-c-devel \ - mesa-dri-drivers \ - mesa-libEGL-devel \ - mesa-libGL-devel \ - mesa-libgbm-devel \ - ninja-build \ - nss-devel \ - openal-soft-devel \ - opus-devel \ - pciutils-devel \ - perl \ - poppler-cpp-devel \ - pulseaudio-libs-devel \ - python3-sphinx \ - python3.12 \ - python3.12-pip \ - qt5-rpm-macros \ - re2-devel \ - systemd-devel \ - tar \ - time \ - unixODBC-devel \ - unzip \ - wayland-devel \ - wget \ - xcb-util-cursor-devel \ - xcb-util-devel \ - xcb-util-image-devel \ - xcb-util-keysyms-devel \ - xcb-util-renderutil-devel \ - xcb-util-wm-devel \ - xkeyboard-config-devel \ - xorg-x11-server-Xvfb \ - xorg-x11-xkb-utils-devel \ - xz \ - xz-devel \ - libcanberra-devel \ - zlib-devel && \ - alternatives --set python /usr/bin/python3.12 && \ - alternatives --set python3 /usr/bin/python3.12 - -########################################################################### - -# Install craftmaster -RUN \ - cd /root && \ - git clone https://invent.kde.org/packaging/craftmaster.git \ - ; - -ADD craftmaster-stable-33.0.ini /root/craftmaster.ini - -ENV CRAFT_IMAGE "linux-gcc-x86_64-qt6.10.2-20260219.tar.gz" - -ENV PATH "$PATH:/root/linux-gcc-x86_64/dev-utils/bin" - -# Install binary dependencies -RUN \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-33.0|" && \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-nextcloud.git|stable-33.0|" && \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c craft && \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --install-deps nextcloud-client \ - ; diff --git a/client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8 b/client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8 deleted file mode 100644 index abf91341..00000000 --- a/client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8 +++ /dev/null @@ -1,158 +0,0 @@ -FROM almalinux/8-base - -MAINTAINER Desktop Team - -# Run 'docker build' with '--build-arg BUILD_QT=1' to build Qt from source (default: not set) -ARG BUILD_QT - -RUN dnf update -y && \ - dnf install -y epel-release && \ - dnf config-manager --set-enabled powertools && \ - dnf update -y && \ - dnf install -y \ - '@Development Tools' \ - alsa-lib-devel \ - at-spi2-core-devel \ - clang \ - clang-devel \ - cmake \ - cups-devel \ - curl \ - dbus-devel \ - dbus-x11 \ - desktop-file-utils \ - expat-devel \ - fontconfig-devel \ - freetype-devel \ - gcc-toolset-14 \ - gcc-toolset-14-libatomic-devel \ - git \ - glib2-devel \ - glx-utils \ - gperf \ - gstreamer1-devel \ - gstreamer1-plugins-bad-free-devel \ - gstreamer1-plugins-base-devel \ - gtk3-devel \ - harfbuzz-devel \ - inkscape \ - jsoncpp-devel \ - lcms2-devel \ - libICE-devel \ - libSM-devel \ - libX11-devel \ - libXScrnSaver-devel \ - libXcomposite-devel \ - libXcursor-devel \ - libXdamage-devel \ - libXext-devel \ - libXfixes-devel \ - libXi-devel \ - libXinerama-devel \ - libXrandr-devel \ - libXrender-devel \ - libXtst-devel \ - libXv-devel \ - libcap-devel \ - libcmocka-devel \ - libdrm-devel \ - libevent-devel \ - libglvnd-devel \ - libinput-devel \ - libjpeg-turbo-devel \ - libmng-devel \ - libpng-devel \ - libpq-devel \ - libproxy-devel \ - libsecret-devel \ - libselinux-devel \ - libmount-devel \ - file \ - glib2-devel \ - wget \ - inkscape \ - libstdc++-static \ - libtiff-devel \ - libwebp-devel \ - libxcb-devel \ - libxkbcommon-devel \ - libxkbcommon-x11-devel \ - libxkbfile-devel \ - libxshmfence-devel \ - llvm-devel \ - mariadb-connector-c-devel \ - mesa-dri-drivers \ - mesa-libEGL-devel \ - mesa-libGL-devel \ - mesa-libgbm-devel \ - ninja-build \ - nss-devel \ - openal-soft-devel \ - opus-devel \ - pciutils-devel \ - perl \ - poppler-cpp-devel \ - pulseaudio-libs-devel \ - python3-sphinx \ - python3.12 \ - python3.12-pip \ - qt5-rpm-macros \ - re2-devel \ - systemd-devel \ - tar \ - time \ - unixODBC-devel \ - unzip \ - wayland-devel \ - wget \ - xcb-util-cursor-devel \ - xcb-util-devel \ - xcb-util-image-devel \ - xcb-util-keysyms-devel \ - xcb-util-renderutil-devel \ - xcb-util-wm-devel \ - xkeyboard-config-devel \ - xorg-x11-server-Xvfb \ - xorg-x11-xkb-utils-devel \ - xz \ - xz-devel \ - zlib-devel && \ - alternatives --set python /usr/bin/python3.12 && \ - alternatives --set python3 /usr/bin/python3.12 - -########################################################################### - -# Install craftmaster -RUN \ - cd /root && \ - git clone https://invent.kde.org/packaging/craftmaster.git \ - ; - -ADD craftmaster.qt-6.9.3.ini /root/craftmaster.ini - -ENV CRAFT_IMAGE "linux-gcc-x86_64-qt6.9.3-13012026.tar.gz" - -RUN \ - wget https://download.nextcloud.com/desktop/development/qt/${CRAFT_IMAGE} && \ - tar xf ${CRAFT_IMAGE} && \ - rm ${CRAFT_IMAGE} \ - ; - -RUN \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-4.0|" && \ - cd /root/craft-clone && \ - git remote set-url origin https://github.com/nextcloud/craft.git \ - ; - -ENV PATH "$PATH:/root/linux-gcc-x86_64/dev-utils/bin" - -# Install binary dependencies -RUN \ - rm -r /root/linux-gcc-x86_64/etc/blueprints/locations/desktop-client-blueprints && \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-4.0|" && \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-nextcloud.git|stable-4.0|" && \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c craft && \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --install-deps nextcloud-client && \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --no-cache -i kde/frameworks/tier1/karchive && \ - scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --no-cache -i qt-libs/qtkeychain \ - ; diff --git a/client-appimage-qt6/craftmaster-stable-33.0.ini b/client-appimage-qt6/craftmaster-stable-33.0.ini deleted file mode 100644 index d6d60e9c..00000000 --- a/client-appimage-qt6/craftmaster-stable-33.0.ini +++ /dev/null @@ -1,72 +0,0 @@ -# SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors -# SPDX-License-Identifier: GPL-2.0-or-later -[General] -Branch = stable-33.0-qt-6.10.2 -CraftUrl = https://github.com/nextcloud/craft.git -CraftRevision = 87e4bd4fb7e6b56f7d95df9437e6f4545c7e78f8 -ShallowClone = False - -# Variables defined here override the default value -# The variable names are casesensitive -[Variables] -#Values need to be overwritten to create a cache -UseCache = True -CreateCache = False - -# Settings applicable for all Crafts matrices -# Settings are Category/key=value -# Category is case sensitive -[GeneralSettings] - -General/MacDeploymentTarget = 13.0 - -Compile/BuildType = RelWithDebInfo - -Compile/UseNinja = True - -ShortPath/Enabled = False -ShortPath/EnableJunctions = False - -Packager/RepositoryUrl = https://download.nextcloud.com/desktop/development/craftCache/ -Packager/CacheVersion = stable-33.0-qt-6.10.2 -ContinuousIntegration/Enabled = True - -Packager/UseCache = ${Variables:UseCache} -Packager/CreateCache = ${Variables:CreateCache} -Packager/CacheDir = ${Variables:Root}\cache - -[BlueprintSettings] -nextcloud-client.buildTests = True -binary/mysql.useMariaDB = False -libs/qt6.version = 6.10.2 -craft/craft-blueprints-kde.revision = stable-33.0 -craft/craft-blueprints-nextcloud.revision = stable-33.0 -libs/zlib.version = 1.3.1 -libs/openssl.version = 3.5.7 - -[windows-msvc2022_64-cl] -Packager/PackageType = NullsoftInstallerPackager -QtSDK/Compiler = msvc2022_64 -General/ABI = windows-msvc2022_64-cl -Paths/Python = C:\Python312-x64 - -[macos-64-clang] -General/ABI = macos-64-clang - -[macos-clang-arm64] -General/ABI = macos-clang-arm64 -Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64 - -[linux-gcc-x86_64] -General/ABI = linux-gcc-x86_64 -Paths/Python = /usr/bin/python3 -Packager/RepositoryUrl = https://files.kde.org/craft/Qt6/ -Packager/CacheVersion = 26.02 - -[Env] -CRAFT_CODESIGN_CERTIFICATE = -SIGN_PACKAGE = False - -[Custom_Variables_for_Brander] -qtPath = /root/linux-gcc-x86_64 -dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.10.2-2 diff --git a/client-appimage-qt6/craftmaster.qt-6.9.3.ini b/client-appimage-qt6/craftmaster.qt-6.9.3.ini deleted file mode 100644 index b0496d2b..00000000 --- a/client-appimage-qt6/craftmaster.qt-6.9.3.ini +++ /dev/null @@ -1,71 +0,0 @@ -# SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors -# SPDX-License-Identifier: GPL-2.0-or-later -[General] -Branch = stable-4.0-qt-6.9.3 -CraftUrl = https://github.com/nextcloud/craft.git -CraftRevision = 22cf36e8e0b6d0091b6ced384650588ddd5ad0ea -ShallowClone = False - -# Variables defined here override the default value -# The variable names are casesensitive -[Variables] -#Values need to be overwritten to create a cache -UseCache = True -CreateCache = False - -# Settings applicable for all Crafts matrices -# Settings are Category/key=value -# Category is case sensitive -[GeneralSettings] - -General/MacDeploymentTarget = 12.0 - -Compile/BuildType = RelWithDebInfo - -Compile/UseNinja = True - -ShortPath/Enabled = False -ShortPath/EnableJunctions = False - -Packager/RepositoryUrl = https://download.nextcloud.com/desktop/development/craftCache/ -Packager/CacheVersion = stable-4.0-qt-6.9.3 -ContinuousIntegration/Enabled = True - -Packager/UseCache = ${Variables:UseCache} -Packager/CreateCache = ${Variables:CreateCache} -Packager/CacheDir = ${Variables:Root}\cache - -[BlueprintSettings] -nextcloud-client.buildTests = True -binary/mysql.useMariaDB = False -libs/qt6.version = 6.9.3 -craft/craft-blueprints-kde.revision = stable-4.0 -libs/zlib.version = 1.3.1 -libs/openssl.version = 3.5.7 - -[windows-msvc2022_64-cl] -Packager/PackageType = NullsoftInstallerPackager -QtSDK/Compiler = msvc2022_64 -General/ABI = windows-msvc2022_64-cl -Paths/Python = C:\Python312-x64 - -[macos-64-clang] -General/ABI = macos-64-clang - -[macos-clang-arm64] -General/ABI = macos-clang-arm64 -Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64 - -[linux-gcc-x86_64] -General/ABI = linux-gcc-x86_64 -Paths/Python = /usr/bin/python3 -Packager/RepositoryUrl = https://files.kde.org/craft/Qt6/ -Packager/CacheVersion = 25.12 - -[Env] -CRAFT_CODESIGN_CERTIFICATE = -SIGN_PACKAGE = False - -[Custom_Variables_for_Brander] -qtPath = /root/linux-gcc-x86_64 -dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-el8-6.9.3-4