update compile-test containers

archlinux: the kde packages were renamed from ksomething to ksomething5
KDAB · Dec 11, 2023 · d93d905 · d93d905
1 parent ea2ccbd
commit d93d905
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/scripts/appimage/Dockerfile b/scripts/appimage/Dockerfile
@@ -8,7 +8,7 @@ FROM centos/devtoolset-7-toolchain-centos7 as intermediate
 
 ARG QT_VERSION=5.15.11
 ARG KF5_VERSION v5.110.0
-ARG KDDockWidgets_VERSION=1.7
+ARG KDDockWidgets_VERSION=2.0
 ARG QCustomPlot_VERSION=2.1.1
 ARG rust_demangler_VERSION=0.1.23
 ARG d_demangler_VERSION=0.0.2

diff --git a/scripts/compile-test/BaseArchlinux b/scripts/compile-test/BaseArchlinux
@@ -6,5 +6,5 @@ RUN pacman -Sy --noconfirm && \
     pacman -S archlinux-keyring --noconfirm && pacman-key --init && pacman-key --populate && \
     pacman -Syu --noconfirm git make qt5-x11extras cmake gcc extra-cmake-modules \
     libelf gettext qt5-base ninja qcustomplot \
-    threadweaver kconfigwidgets knotifications karchive syntax-highlighting \
-    kiconthemes kitemviews kitemmodels kwindowsystem kio kparts solid clazy python python-yaml
+    threadweaver5 kconfigwidgets5 knotifications5 karchive5 syntax-highlighting5 \
+    kiconthemes5 kitemviews5 kitemmodels5 kwindowsystem5 kio5 kparts5 solid5 clazy python python-yaml
diff --git a/scripts/compile-test/BuildDependencies b/scripts/compile-test/BuildDependencies
@@ -1,9 +1,10 @@
 ARG BASEIMAGE
 FROM $BASEIMAGE
 
+ARG KDDOCKWIDGETS_VERSION="1.6"
 WORKDIR /opt
 
-RUN git clone -b 1.6 https://github.com/KDAB/KDDockWidgets && \
+RUN git clone -b "$KDDOCKWIDGETS_VERSION" https://github.com/KDAB/KDDockWidgets && \
     cd KDDockWidgets && mkdir build && cd build && \
     cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr/ \
         -DKDDockWidgets_EXAMPLES=OFF -G Ninja .. && \

diff --git a/scripts/compile-test/BuildDependenciesQt6 b/scripts/compile-test/BuildDependenciesQt6
@@ -1,6 +1,7 @@
 ARG BASEIMAGE
 FROM $BASEIMAGE
 
+ARG KDDOCKWIDGETS_VERSION
 WORKDIR /opt
 
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
@@ -17,7 +18,7 @@ RUN wget https://www.qcustomplot.com/release/2.1.1/QCustomPlot-source.tar.gz &&
     qmake6 CONFIG+=release CONFIG+=force_debug_info && make -j && \
     cp -va libqcustomplot* /usr/lib/x86_64-linux-gnu/ && cd /opt && rm -Rf qcustomplot-source
 
-RUN git clone -b 1.7 https://github.com/KDAB/KDDockWidgets && \
+RUN git clone -b $KDDOCKWIDGETS_VERSION https://github.com/KDAB/KDDockWidgets && \
     cd KDDockWidgets && mkdir build && cd build && \
     cmake -DCMAKE_BUILD_TYPE=Debug -DKDDockWidgets_QT6=ON -DCMAKE_INSTALL_PREFIX=/usr/ \
         -DKDDockWidgets_EXAMPLES=OFF -G Ninja .. && \

diff --git a/scripts/compile-test/build.sh b/scripts/compile-test/build.sh
@@ -23,6 +23,8 @@ buildBase()
 buildDependencies()
 {
     distro=$1
+    kddw_version=$2
+
     tag=$(toLower $distro)
 
     buildBase $distro
@@ -33,21 +35,22 @@ buildDependencies()
     fi
 
     docker build --ulimit nofile=1024:262144 -t hotspot-$tag-dependencies \
-        --build-arg BASEIMAGE=hotspot-$tag-base \
+        --build-arg BASEIMAGE=hotspot-$tag-base --build-arg KDDOCKWIDGETS_VERSION="$kddw_version" \
         -f scripts/compile-test/BuildDependencies$suffix $extraArgs .
 }
 
 buildHotspotWithPresets()
 {
     distro=$1
+    kddw_version=$2
     tag=$(toLower $distro)
 
     suffix=
     if [[ $distro == *Qt6 ]]; then
         suffix=Qt6
     fi
 
-    buildDependencies $distro
+    buildDependencies $distro $kddw_version
     docker build --ulimit nofile=1024:262144 -t hotspot-$tag \
         --build-arg BASEIMAGE=hotspot-$tag-dependencies \
         -f scripts/compile-test/BuildHotspotWithPresets$suffix $extraArgs .
@@ -56,18 +59,19 @@ buildHotspotWithPresets()
 buildHotspotWithoutPresets()
 {
     distro=$1
+    kddw_version=$2
     tag=$(toLower $distro)
 
-    buildDependencies $distro
+    buildDependencies $distro $kddw_version
     docker build --ulimit nofile=1024:262144 -t hotspot-$tag \
         --build-arg BASEIMAGE=hotspot-$tag-dependencies \
         -f scripts/compile-test/BuildHotspotWithoutPresets $extraArgs .
 }
 
 export DOCKER_BUILDKIT=1
-buildHotspotWithoutPresets Ubuntu20.04
-buildHotspotWithPresets Ubuntu22.04
-buildHotspotWithPresets Archlinux
-buildHotspotWithPresets OpenSuseTumbleweed
-buildHotspotWithoutPresets Fedora34
-buildHotspotWithPresets NeonQt6
+buildHotspotWithoutPresets Ubuntu20.04 1.6
+buildHotspotWithPresets Ubuntu22.04 2.0
+buildHotspotWithPresets Archlinux 2.0
+buildHotspotWithPresets OpenSuseTumbleweed 2.0
+buildHotspotWithoutPresets Fedora34 2.0
+buildHotspotWithPresets NeonQt6 2.0