Skip to content

Commit cfcf22f

Browse files
committed
COMP: Update GitHub Actions pipelines standardize on building against Qt 5.15.2
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 59d84b8 commit cfcf22f

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ${{ matrix.os }}
99
strategy:
1010
matrix:
11-
os: [ubuntu-18.04, ubuntu-latest]
11+
os: [ubuntu-20.04]
1212

1313
steps:
1414
- name: Checkout
@@ -20,7 +20,7 @@ jobs:
2020
- name: Install Qt
2121
uses: jurplel/install-qt-action@v3
2222
with:
23-
version: 5.14.2
23+
version: 5.15.2
2424
target: desktop
2525
host: linux
2626
install-deps: true

.github/workflows/mac.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [push, pull_request]
55
jobs:
66
mac-build-gui:
77

8-
runs-on: macOS-latest
8+
runs-on: macos-10.15
99

1010
steps:
1111
- name: Checkout
@@ -14,14 +14,14 @@ jobs:
1414
- name: Install Qt
1515
uses: jurplel/install-qt-action@v3
1616
with:
17-
version: 5.14.2
17+
version: 5.15.2
1818
target: desktop
1919
host: mac
2020
install-deps: true
2121

22-
- name: Prepare
23-
run: |
24-
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
22+
#- name: Prepare
23+
# run: |
24+
# 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
2525

2626
- name: make
2727
run: ./build.sh -DQt5_PATH="${Qt5_Dir}"

.github/workflows/windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
windows-build-gui:
88
strategy:
99
matrix:
10-
qtversion: [5.12.8, 5.14.2]
11-
runs-on: windows-2016
10+
qtversion: [5.15.2]
11+
runs-on: windows-2022
1212

1313
steps:
1414

@@ -27,7 +27,7 @@ jobs:
2727
- name: Configure
2828
working-directory: bin
2929
run: |
30-
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 15 2017" -Ax64 -DQt5_PATH:PATH="$env:Qt5_Dir" -DBUILD_WITH_PYTHON:BOOL=OFF
30+
cmake ..\Superbuild -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 17 2022" -Ax64 -Tv143 -DQt5_PATH:PATH="$env:Qt5_Dir" -DBUILD_WITH_PYTHON:BOOL=OFF
3131
3232
- name: Compile
3333
working-directory: bin

0 commit comments

Comments
 (0)