Skip to content

Commit cb23254

Browse files
committed
COMP: Update GitHub Actions pipelines standardize on building against Qt 5.15.2
All: * Standardize on using Qt 5.15.2 * Split configure command across multiple lines Linux: * Update runner from "ubuntu-18.04" to "ubuntu-20.04" macOS: * Hard-code runner to "macos-10.15" Windows: * Update runner from "windows-2016" to "windows-2022" * Update Visual Studio from "15 2017" to "17 2022" * Explicitly specify toolset v143
1 parent 45be287 commit cb23254

File tree

3 files changed

+31
-13
lines changed

3 files changed

+31
-13
lines changed

.github/workflows/linux.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
matrix:
15-
os: [ubuntu-18.04, ubuntu-latest]
15+
os: [ubuntu-20.04]
1616

1717
steps:
1818
- name: Checkout
@@ -24,11 +24,14 @@ jobs:
2424
- name: Install Qt
2525
uses: jurplel/install-qt-action@v3
2626
with:
27-
version: 5.14.2
27+
version: 5.15.2
2828
target: desktop
2929
host: linux
3030
install-deps: true
3131

3232
- name: Build
33-
run: ./build.sh -DQt5_PATH="${Qt5_Dir}" -j3
33+
run: |
34+
./build.sh \
35+
-DQt5_PATH="${Qt5_Dir}" \
36+
-j3
3437
continue-on-error: true

.github/workflows/mac.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ concurrency:
99
jobs:
1010
mac-build-gui:
1111

12-
runs-on: macOS-latest
12+
runs-on: macos-10.15
1313

1414
steps:
1515
- name: Checkout
@@ -18,17 +18,19 @@ jobs:
1818
- name: Install Qt
1919
uses: jurplel/install-qt-action@v3
2020
with:
21-
version: 5.14.2
21+
version: 5.15.2
2222
target: desktop
2323
host: mac
2424
install-deps: true
2525

26-
- name: Prepare
27-
run: |
28-
ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11
26+
#- name: Prepare
27+
# run: |
28+
# ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11
2929

3030
- name: make
31-
run: ./build.sh -DQt5_PATH="${Qt5_Dir}"
31+
run: |
32+
./build.sh \
33+
-DQt5_PATH="${Qt5_Dir}"
3234
3335
- name: Package
3436
working-directory: bin/Seg3D

.github/workflows/windows.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,14 @@ jobs:
1111
windows-build-gui:
1212
strategy:
1313
matrix:
14-
qtversion: [5.12.8, 5.14.2]
15-
runs-on: windows-2016
14+
qtversion: [5.15.2]
15+
include:
16+
- qtversion: 5.15.2
17+
qtarch: win64_msvc2019_64
18+
cmake-generator: "Visual Studio 17 2022"
19+
cmake-arch: x64
20+
cmake-toolset: v143
21+
runs-on: windows-2022
1622

1723
steps:
1824

@@ -25,13 +31,20 @@ jobs:
2531
version: ${{ matrix.qtversion }}
2632
target: desktop
2733
host: windows
28-
arch: win64_msvc2017_64
34+
arch: ${{ matrix.qtarch }}
2935
install-deps: true
3036

3137
- name: Configure
3238
working-directory: bin
3339
run: |
34-
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 15 2017" -Ax64 -DQt5_PATH:PATH="$env:Qt5_Dir" -DBUILD_WITH_PYTHON:BOOL=OFF
40+
cmake `
41+
..\Superbuild `
42+
-DCMAKE_BUILD_TYPE=Release `
43+
-G"${{ matrix.cmake-generator }}" `
44+
-A${{ matrix.cmake-arch }} `
45+
-T${{ matrix.cmake-toolset }} `
46+
-DQt5_PATH:PATH="$env:Qt5_Dir" `
47+
-DBUILD_WITH_PYTHON:BOOL=OFF
3548
3649
- name: Compile
3750
working-directory: bin

0 commit comments

Comments
 (0)