Skip to content

Commit 3b964ad

Browse files
committed
use spatial-model-editor/setup-ci@v1
1 parent b6c21d6 commit 3b964ad

File tree

1 file changed

+6
-40
lines changed

1 file changed

+6
-40
lines changed

.github/workflows/release.yml

+6-40
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,14 @@ jobs:
1111
name: Linux
1212
runs-on: ubuntu-20.04
1313
env:
14-
INSTALL_PREFIX: "/opt/smelibs"
15-
SUDO_CMD: "sudo"
16-
# legacy opengl option prevents qt from depending on libOpenGL: https://bugreports.qt.io/browse/QTBUG-89754
17-
CONFIGURE_EXTRAS: "-DFEATURE_xcb=ON -DINPUT_bundled_xcb_xinput=yes -DFEATURE_libudev=OFF -DOpenGL_GL_PREFERENCE=LEGACY"
18-
OS: "linux"
19-
CC: "clang"
20-
CXX: "clang++"
14+
CONFIGURE_EXTRAS: "-DFEATURE_xcb=ON -DINPUT_bundled_xcb_xinput=yes -DFEATURE_libudev=OFF"
2115
defaults:
2216
run:
2317
shell: bash
2418
steps:
25-
- name: Add llvm repo for clang 18
26-
run: |
27-
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-18 main"
29-
- name: Install Qt build dependencies
30-
run: |
31-
sudo apt update -yy
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'
33-
- name: Set clang version
34-
run: |
35-
sudo update-alternatives --remove-all clang || echo "nothing to remove"
36-
sudo update-alternatives --remove-all clang++ || echo "nothing to remove"
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
19+
- uses: spatial-model-editor/setup-ci@v1
20+
with:
21+
extra-deps: "libglu1-mesa-dev 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'"
3922
- uses: actions/checkout@v4
4023
- name: Build script
4124
run: ./build.sh
@@ -47,21 +30,11 @@ jobs:
4730
macos:
4831
name: MacOS
4932
runs-on: macos-13
50-
env:
51-
INSTALL_PREFIX: "/opt/smelibs"
52-
SUDO_CMD: "sudo"
53-
MACOSX_DEPLOYMENT_TARGET: "11"
54-
CONFIGURE_EXTRAS: ""
55-
OS: "osx"
5633
defaults:
5734
run:
5835
shell: bash
5936
steps:
60-
- name: Brew install ninja
61-
run: brew install ninja
62-
- uses: maxim-lobanov/setup-xcode@v1
63-
with:
64-
xcode-version: "14.3"
37+
- uses: spatial-model-editor/setup-ci@v1
6538
- uses: actions/checkout@v4
6639
- name: Build script
6740
run: ./build.sh
@@ -74,20 +47,13 @@ jobs:
7447
name: Windows 64-bit Mingw
7548
runs-on: windows-2022
7649
env:
77-
INSTALL_PREFIX: "/c/smelibs"
78-
SUDO_CMD: ""
7950
CONFIGURE_EXTRAS: "-DQT_QMAKE_TARGET_MKSPEC=win32-g++"
80-
OS: "win64-mingw"
8151
defaults:
8252
run:
8353
shell: msys2 {0}
8454
steps:
55+
- uses: spatial-model-editor/setup-ci@v1
8556
- uses: actions/checkout@v4
86-
- uses: msys2/setup-msys2@v2
87-
with:
88-
msystem: UCRT64
89-
update: true
90-
install: mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-ninja git
9157
- name: Build script
9258
run: ./build.sh
9359
- uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)