From f61644d94435eb8302adbc4c550da129f3a7960c Mon Sep 17 00:00:00 2001 From: Liam Keegan Date: Wed, 8 Nov 2023 17:20:46 +0100 Subject: [PATCH] qt -> 6.6.0 build system updates - ubuntu clang -> 17 - macos -> 13 - xcode -> 14.3 - deployment target -> 11 --- .github/workflows/release.yml | 33 ++++++++++++++++++--------------- .pre-commit-config.yaml | 2 +- README.md | 4 ++-- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ced0a49..304cb82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,8 +3,8 @@ name: Release Builds on: push env: - QT_VERSION: "v6.5.1" - ZLIB_VERSION: "v1.2.13" # not used for msvc builds + QT_VERSION: "v6.6.0" + ZLIB_VERSION: "v1.3" # not used for msvc builds jobs: linux: @@ -22,21 +22,21 @@ jobs: run: shell: bash steps: - - name: Add llvm repo for clang 16 + - name: Add llvm repo for clang 17 run: | sudo wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main" + sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main" - name: Install Qt build dependencies run: | sudo apt update -yy - sudo apt install -yy clang-16 libglu1-mesa-dev ninja-build libx11-dev libx11-xcb-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxkbcommon-dev libxkbcommon-x11-dev '^libxcb.*-dev' + sudo apt install -yy clang-17 libglu1-mesa-dev ninja-build libx11-dev libx11-xcb-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxkbcommon-dev libxkbcommon-x11-dev '^libxcb.*-dev' - name: Set clang version run: | sudo update-alternatives --remove-all clang || echo "nothing to remove" sudo update-alternatives --remove-all clang++ || echo "nothing to remove" - sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100 - sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100 - - uses: actions/checkout@v3 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 100 + sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 100 + - uses: actions/checkout@v4 - name: Build script run: ./build.sh - uses: actions/upload-artifact@v3 @@ -45,11 +45,11 @@ jobs: macos: name: MacOS - runs-on: macos-12 + runs-on: macos-13 env: INSTALL_PREFIX: "/opt/smelibs" SUDO_CMD: "sudo" - MACOSX_DEPLOYMENT_TARGET: "11.0" + MACOSX_DEPLOYMENT_TARGET: "11" CONFIGURE_EXTRAS: "" OS: "osx" defaults: @@ -58,7 +58,10 @@ jobs: steps: - name: Brew install ninja run: brew install ninja - - uses: actions/checkout@v3 + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: "14.3" + - uses: actions/checkout@v4 - name: Build script run: ./build.sh - uses: actions/upload-artifact@v3 @@ -77,7 +80,7 @@ jobs: run: shell: msys2 {0} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 with: msystem: MINGW64 @@ -101,7 +104,7 @@ jobs: run: shell: msys2 {0} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 with: msystem: MINGW32 @@ -120,7 +123,7 @@ jobs: INSTALL_PREFIX: 'C:\smelibs' OS: "win64-msvc" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64 @@ -138,7 +141,7 @@ jobs: INSTALL_PREFIX: 'C:\smelibs' OS: "win32-msvc" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64_x86 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e9b5cd1..ac63817 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-yaml - id: end-of-file-fixer diff --git a/README.md b/README.md index ac8f19a..c414646 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ and used instead of the bundled Qt version (does not apply to msvc builds) Get the latest versions here: -- linux (clang 16 / Ubuntu 20.04): [sme_deps_qt_linux.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_linux.tgz) -- osx (Apple clang 14 / macOS 12 / MACOSX_DEPLOYMENT_TARGET 11.0): [sme_deps_qt_osx.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_osx.tgz) +- linux (clang 17 / Ubuntu 20.04): [sme_deps_qt_linux.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_linux.tgz) +- osx (Xcode 14.3 / macOS 13 / MACOSX_DEPLOYMENT_TARGET 11): [sme_deps_qt_osx.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_osx.tgz) - win32-mingw (mingw-w64-i686-gcc 13): [sme_deps_qt_win32-mingw.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_win32-mingw.tgz) - win64-mingw (mingw-w64-x86_64-gcc 13): [sme_deps_qt_win64-mingw.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_win64-mingw.tgz) - win32-msvc (VC++ 2015 Toolset): [sme_deps_qt_win32-msvc.tgz](https://github.com/spatial-model-editor/sme_deps_qt/releases/latest/download/sme_deps_qt_win32-msvc.tgz)