Update docker images and build matrix

.github/workflows/linux.yml

@@ -8,23 +8,33 @@ jobs:
     strategy:
       matrix:
         config:
+          - {
+              id: 'ubuntu-22.04-qt6',
+              name: "Ubuntu 22.04",
+              docker_image: "fwbuilder/ubuntu:22.04",
+              unit_tests: true,
+              qt6: true,
+            }
+          - {
+              id: 'ubuntu-22.04-qt5',
+              name: "Ubuntu 22.04",
+              docker_image: "fwbuilder/ubuntu:22.04",
+              unit_tests: true,
+              qt6: false,
+            }
           - {
               id: 'ubuntu-20.04',
               name: "Ubuntu 20.04",
               docker_image: "fwbuilder/ubuntu:20.04",
-              unit_tests: true
+              unit_tests: true,
+              qt6: false,
             }
           - {
               id: 'ubuntu-18.04',
               name: "Ubuntu 18.04",
               docker_image: "fwbuilder/ubuntu:18.04",
-              unit_tests: true
-            }
-          - {
-              id: 'ubuntu-16.04',
-              name: "Ubuntu 16.04",
-              docker_image: "fwbuilder/ubuntu:16.04",
-              unit_tests: false
+              unit_tests: true,
+              qt6: false,
             }
     container:
       image: ${{ matrix.config.docker_image }}
@@ -38,7 +48,13 @@ jobs:
           key: ${{ matrix.config.id }}-ccache-${{ github.sha }}
           restore-keys: |
             ${{ matrix.config.id }}-ccache
-      - name: Configure
+      - name: Configure (Qt6)
+        if: ${{ matrix.config.qt6 == true }}
+        run: |
+          mkdir -p build && cd build
+          cmake .. -DCMAKE_BUILD_TYPE=Debug -DUseQt6=ON
+      - name: Configure (Qt5)
+        if: ${{ matrix.config.qt6 == false }}
         run: |
           mkdir -p build && cd build
           cmake .. -DCMAKE_BUILD_TYPE=Debug

.github/workflows/w32-mxe.yml

@@ -13,11 +13,6 @@ jobs:
               name: "MXE Qt 5.15",
               docker_image: "fwbuilder/mxe:qt-5.15"
             }
-          - {
-              id: "mxe-qt-5.12",
-              name: "MXE Qt 5.12",
-              docker_image: "fwbuilder/mxe:qt-5.12"
-            }
     container:
       image: ${{ matrix.config.docker_image }}
     steps:

docker/Dockerfile.mxe_qt-5.12

@@ -1,37 +0,0 @@
-FROM debian:stretch AS builder
-RUN apt-get update && apt-get install -y \
-    autoconf \
-    automake \
-    autopoint \
-    binutils \
-    bison \
-    build-essential \
-    bzip2 \
-    cmake \
-    fakeroot \
-    flex \
-    git \
-    make \
-    gperf \
-    intltool \
-    libgdk-pixbuf2.0-dev \
-    libtool \
-    libtool-bin \
-    lzip \
-    python \
-    p7zip-full \
-    ruby \
-    unzip \
-    wget
-WORKDIR /opt
-RUN git clone https://github.com/mxe/mxe.git
-# Use Qt 5.12.4
-RUN cd mxe && git checkout 0567f17d34463abda1790957812c54e8c0cf59fe -- src/qtbase.mk
-RUN cd mxe && make MXE_TARGETS='i686-w64-mingw32.shared' -j$(nproc) qtbase libxml2 libxslt
-RUN /opt/mxe/.ccache/bin/ccache -Cz
-
-FROM debian:stretch
-RUN apt-get update && apt-get install -y nsis make git
-WORKDIR /
-COPY --from=builder /opt/mxe /opt/mxe
-CMD ["bash"]

docker/Dockerfile.mxe_qt-5.15

@@ -1,4 +1,4 @@
-FROM debian:stretch AS builder
+FROM debian:bullseye AS builder
 RUN apt-get update && apt-get install -y \
     autoconf \
     automake \
@@ -20,19 +20,19 @@ RUN apt-get update && apt-get install -y \
     libssl-dev \
     lzip \
     python \
-    python-mako \
+    python3-mako \
     p7zip-full \
     ruby \
     unzip \
     wget
 WORKDIR /opt
 RUN git clone https://github.com/mxe/mxe.git
-# Use Qt 5.15.1
-RUN cd mxe && git checkout eb26bce6dd1b4b7a79cdbd9011251e6101bed60d -- src/qtbase.mk
+# Use Qt 5.15.10
+RUN cd mxe && git checkout 5f3972b4334172a9ba86e0a1b2112715fb70a680 -- src/qtbase.mk
 RUN cd mxe && make MXE_TARGETS='i686-w64-mingw32.shared' -j$(nproc) qtbase libxml2 libxslt
 RUN /opt/mxe/.ccache/bin/ccache -Cz
 
-FROM debian:stretch
+FROM debian:bullseye
 RUN apt-get update && apt-get install -y nsis make git ccache
 WORKDIR /
 COPY --from=builder /opt/mxe /opt/mxe

docker/Dockerfile.ubuntu_22.04

@@ -1,5 +1,6 @@
-FROM ubuntu:16.04
+FROM ubuntu:22.04
 
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y \
     autoconf \
     automake \
@@ -13,8 +14,12 @@ RUN apt-get update && apt-get install -y \
     nsis \
     cmake \
     git \
-    qt5-default \
+    qt5-qmake \
+    qtbase5-dev \ 
+    qt6-base-dev \
     ccache
 
+RUN apt-get clean
+
 WORKDIR /
 CMD ["bash"]