Skip to content

Commit b6c21d6

Browse files
committed
Qt -> 6.6.2, zlib -> 1.3.1, use clang-18 on linux
1 parent 23bc3bb commit b6c21d6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/release.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: Release Builds
33
on: push
44

55
env:
6-
QT_VERSION: "v6.6.1"
7-
ZLIB_VERSION: "v1.3" # not used for msvc builds
6+
QT_VERSION: "v6.6.2"
7+
ZLIB_VERSION: "v1.3.1" # not used for msvc builds
88

99
jobs:
1010
linux:
@@ -22,20 +22,20 @@ jobs:
2222
run:
2323
shell: bash
2424
steps:
25-
- name: Add llvm repo for clang 17
25+
- name: Add llvm repo for clang 18
2626
run: |
2727
sudo wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
28-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main"
28+
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main"
2929
- name: Install Qt build dependencies
3030
run: |
3131
sudo apt update -yy
32-
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'
32+
sudo apt install -yy clang-18 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'
3333
- name: Set clang version
3434
run: |
3535
sudo update-alternatives --remove-all clang || echo "nothing to remove"
3636
sudo update-alternatives --remove-all clang++ || echo "nothing to remove"
37-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 100
38-
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 100
37+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100
38+
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100
3939
- uses: actions/checkout@v4
4040
- name: Build script
4141
run: ./build.sh

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ and used instead of the bundled Qt version (does not apply to msvc builds)
1010

1111
Get the latest versions here:
1212

13-
- 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)
13+
- linux (clang 18 / 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)
1414
- 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)
1515
- 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)
1616
- 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)

0 commit comments

Comments
 (0)