Update to Ubuntu noble, and latest QBS, GCC, CLANG and QT versions

arBmind · Jun 9, 2024 · 36ab357 · 36ab357
1 parent 35957ed
commit 36ab357
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 30 deletions.
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
@@ -8,26 +8,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distro: ['lunar']
-        qbs_version: ['1.24.1', '2.0.2', '2.1.2']
+        distro: ['noble']
+        qbs_version: ['2.1.2', '2.2.2', '2.3.1']
         clang: [
-          {major: 15, source: 'apt'},
           {major: 16, source: 'apt'},
-          {major: 17, source: 'llvm'}
+          {major: 17, source: 'llvm'},
+          {major: 18, source: 'llvm'}
         ]
         gcc: [
-          {major: 11, source: 'apt'},
           {major: 12, source: 'apt'},
-          {major: 13, source: 'apt'}
+          {major: 13, source: 'apt'},
+          {major: 14, source: 'apt'}
+        ]
+        qt: [
+          {version: '6.5.3', arch: 'gcc_64'},
+          {version: '6.6.3', arch: 'gcc_64'},
+          {version: '6.7.1', arch: 'linux_gcc_64'}
         ]
-        qt_version: ['6.4.3', '6.5.3']
 
         include:
-          - distro: lunar
-            qbs_version: '2.1.2'
-            clang: {major: 17, source: 'llvm'}
-            gcc: {major: 13, source: 'apt'}
-            qt_version: '6.5.3'
+          - distro: noble
+            qbs_version: '2.3.1'
+            clang: {major: 18, source: 'llvm'}
+            gcc: {major: 14, source: 'apt'}
+            qt: {version: '6.7.1', arch: 'linux_gcc_64'}
             gcc_tags: |
               arbmind/qbs-gcc:latest
               ghcr.io/arbmind/qbs-gcc:latest
@@ -80,23 +84,25 @@ jobs:
             DISTRO=${{ matrix.distro }}
             GCC_MAJOR=${{ matrix.gcc.major }}
             GCC_SOURCE=${{ matrix.gcc.source }}
-            QT_VERSION=${{ matrix.qt_version }}
+            QT_VERSION=${{ matrix.qt.version }}
+            QT_ARCH=${{ matrix.qt.arch }}
             QBS_VERSION=${{ matrix.qbs_version }}
 
-      - name: Qbs ${{ matrix.qbs_version }} + GCC ${{ matrix.gcc.major }} + Qt ${{ matrix.qt_version }}
+      - name: Qbs ${{ matrix.qbs_version }} + GCC ${{ matrix.gcc.major }} + Qt ${{ matrix.qt.version }}
         uses: docker/build-push-action@v3
         with:
           target: qbs-gcc-qt
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
-            arbmind/qbs-gcc-qt:${{ matrix.qbs_version }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
-            ghcr.io/arbmind/qbs-gcc-qt:${{ matrix.qbs_version }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
+            arbmind/qbs-gcc-qt:${{ matrix.qbs_version }}-${{ matrix.gcc.major }}-${{ matrix.qt.version }}
+            ghcr.io/arbmind/qbs-gcc-qt:${{ matrix.qbs_version }}-${{ matrix.gcc.major }}-${{ matrix.qt.version }}
             ${{ matrix.gcc_qt_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}
             GCC_MAJOR=${{ matrix.gcc.major }}
             GCC_SOURCE=${{ matrix.gcc.source }}
-            QT_VERSION=${{ matrix.qt_version }}
+            QT_VERSION=${{ matrix.qt.version }}
+            QT_ARCH=${{ matrix.qt.arch }}
             QBS_VERSION=${{ matrix.qbs_version }}
 
       - name: Qbs ${{ matrix.qbs_version }} + Clang ${{ matrix.clang.major }}
@@ -112,7 +118,8 @@ jobs:
             DISTRO=${{ matrix.distro }}
             CLANG_MAJOR=${{ matrix.clang.major }}
             CLANG_SOURCE=${{ matrix.clang.source }}
-            QT_VERSION=${{ matrix.qt_version }}
+            QT_VERSION=${{ matrix.qt.version }}
+            QT_ARCH=${{ matrix.qt.arch }}
             QBS_VERSION=${{ matrix.qbs_version }}
 
       - name: Qbs ${{ matrix.qbs_version }} + Clang ${{ matrix.clang.major }} + LibStdC++ ${{ matrix.gcc.major }}
@@ -130,23 +137,25 @@ jobs:
             CLANG_SOURCE=${{ matrix.clang.source }}
             GCC_MAJOR=${{ matrix.gcc.major }}
             GCC_SOURCE=${{ matrix.gcc.source }}
-            QT_VERSION=${{ matrix.qt_version }}
+            QT_VERSION=${{ matrix.qt.version }}
+            QT_ARCH=${{ matrix.qt.arch }}
             QBS_VERSION=${{ matrix.qbs_version }}
 
-      - name: Qbs ${{ matrix.qbs_version }} + Clang ${{ matrix.clang.major }} + LibStdC++ ${{ matrix.gcc.major }} + Qt ${{ matrix.qt_version }}
+      - name: Qbs ${{ matrix.qbs_version }} + Clang ${{ matrix.clang.major }} + LibStdC++ ${{ matrix.gcc.major }} + Qt ${{ matrix.qt.version }}
         uses: docker/build-push-action@v3
         with:
           target: qbs-clang-libstdcpp-qt
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
-            arbmind/qbs-clang-libstdcpp-qt:${{ matrix.qbs_version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
-            ghcr.io/arbmind/qbs-clang-libstdcpp-qt:${{ matrix.qbs_version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
+            arbmind/qbs-clang-libstdcpp-qt:${{ matrix.qbs_version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}-${{ matrix.qt.version }}
+            ghcr.io/arbmind/qbs-clang-libstdcpp-qt:${{ matrix.qbs_version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}-${{ matrix.qt.version }}
             ${{ matrix.clang_libstdcpp_qt_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}
             CLANG_MAJOR=${{ matrix.clang.major }}
             CLANG_SOURCE=${{ matrix.clang.source }}
             GCC_MAJOR=${{ matrix.gcc.major }}
             GCC_SOURCE=${{ matrix.gcc.source }}
-            QT_VERSION=${{ matrix.qt_version }}
+            QT_VERSION=${{ matrix.qt.version }}
+            QT_ARCH=${{ matrix.qt.arch }}
             QBS_VERSION=${{ matrix.qbs_version }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,20 +1,22 @@
-ARG DISTRO=lunar
-ARG CLANG_MAJOR=16
+ARG DISTRO=noble
+ARG CLANG_MAJOR=18
 # clang source options:
 # apt - directly use apt version
 # llvm - add llvm distro repo
 ARG CLANG_SOURCE=apt
-ARG GCC_MAJOR=13
+ARG GCC_MAJOR=14
 # gcc source options:
 # apt - directly use apt version
 # ppa - add toolchain ppa
 ARG GCC_SOURCE=apt
-ARG QT_VERSION=6.5.0
-ARG QT_ARCH=gcc_64
+ARG QT_VERSION=6.7.1
+ARG QT_ARCH=linux_gcc_64
 ARG QT_MODULES=""
-ARG QBS_VERSION="2.0.0"
+ARG QBS_VERSION="2.3.1"
 ARG QBS_URL="https://download.qt.io/official_releases/qbs/${QBS_VERSION}/qbs-linux-x86_64-${QBS_VERSION}.tar.gz"
-ARG RUNTIME_APT="libicu72 libgssapi-krb5-2 libdbus-1-3 libpcre2-16-0"
+# Ubuntu lunar
+# ARG RUNTIME_APT="libicu72 libgssapi-krb5-2 libdbus-1-3 libpcre2-16-0"
+ARG RUNTIME_APT="libicu74 libgssapi-krb5-2 libdbus-1-3 libpcre2-16-0"
 
 
 # base Qt setup