Skip to content

Commit 803eabb

Browse files
committed
use matrix for the builds used by sme
1 parent 3b964ad commit 803eabb

File tree

1 file changed

+22
-46
lines changed

1 file changed

+22
-46
lines changed

.github/workflows/release.yml

Lines changed: 22 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,59 +7,35 @@ env:
77
ZLIB_VERSION: "v1.3.1" # not used for msvc builds
88

99
jobs:
10-
linux:
11-
name: Linux
12-
runs-on: ubuntu-20.04
13-
env:
14-
CONFIGURE_EXTRAS: "-DFEATURE_xcb=ON -DINPUT_bundled_xcb_xinput=yes -DFEATURE_libudev=OFF"
10+
build:
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
include:
16+
- os: "ubuntu-20.04"
17+
shell: "bash"
18+
CONFIGURE_EXTRAS: "-DFEATURE_xcb=ON -DINPUT_bundled_xcb_xinput=yes -DFEATURE_libudev=OFF"
19+
- os: "macos-13"
20+
shell: "bash"
21+
- os: "windows-2022"
22+
shell: "msys2 {0}"
23+
CONFIGURE_EXTRAS: "-DQT_QMAKE_TARGET_MKSPEC=win32-g++"
1524
defaults:
1625
run:
17-
shell: bash
18-
steps:
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'"
22-
- uses: actions/checkout@v4
23-
- name: Build script
24-
run: ./build.sh
25-
- uses: actions/upload-artifact@v4
26-
with:
27-
name: artifacts-linux
28-
path: ./artefacts/*
29-
30-
macos:
31-
name: MacOS
32-
runs-on: macos-13
33-
defaults:
34-
run:
35-
shell: bash
36-
steps:
37-
- uses: spatial-model-editor/setup-ci@v1
38-
- uses: actions/checkout@v4
39-
- name: Build script
40-
run: ./build.sh
41-
- uses: actions/upload-artifact@v4
42-
with:
43-
name: artifacts-macos
44-
path: ./artefacts/*
45-
46-
win64-mingw:
47-
name: Windows 64-bit Mingw
48-
runs-on: windows-2022
26+
shell: ${{ matrix.shell }}
4927
env:
50-
CONFIGURE_EXTRAS: "-DQT_QMAKE_TARGET_MKSPEC=win32-g++"
51-
defaults:
52-
run:
53-
shell: msys2 {0}
28+
CONFIGURE_EXTRAS: ${{ matrix.CONFIGURE_EXTRAS }}
5429
steps:
5530
- uses: spatial-model-editor/setup-ci@v1
5631
- uses: actions/checkout@v4
5732
- name: Build script
5833
run: ./build.sh
5934
- uses: actions/upload-artifact@v4
6035
with:
61-
name: artifacts-win64-mingw
36+
name: artifacts-${{ matrix.os }}
6237
path: ./artefacts/*
38+
retention-days: 3
6339

6440
win32-mingw:
6541
name: Windows 32-bit Mingw
@@ -81,7 +57,7 @@ jobs:
8157
install: mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-ninja git
8258
- name: Build script
8359
run: ./build.sh
84-
- uses: actions/upload-artifact@v3
60+
- uses: actions/upload-artifact@v4
8561
with:
8662
name: artifacts-win32-mingw
8763
path: ./artefacts/*
@@ -100,7 +76,7 @@ jobs:
10076
toolset: 14.0
10177
- name: Build script
10278
run: ./build.ps1
103-
- uses: actions/upload-artifact@v3
79+
- uses: actions/upload-artifact@v4
10480
with:
10581
name: artifacts-win64-msvc
10682
path: ./artefacts/*
@@ -119,13 +95,13 @@ jobs:
11995
toolset: 14.0
12096
- name: Build script
12197
run: ./build.ps1
122-
- uses: actions/upload-artifact@v3
98+
- uses: actions/upload-artifact@v4
12399
with:
124100
name: artifacts-win32-msvc
125101
path: ./artefacts/*
126102

127103
release:
128-
needs: [linux, macos, win64-mingw, win32-mingw, win64-msvc, win32-msvc]
104+
needs: [build, win32-mingw, win64-msvc, win32-msvc]
129105
runs-on: ubuntu-latest
130106
permissions:
131107
contents: write

0 commit comments

Comments
 (0)