Skip to content

Commit ee01eef

Browse files
bunty95bunty95
authored
replace qt5 with qt6 macOS x86_64 (#794)
Replace qt5 on intel builds with qt6. Update minimum macOS from Catalina to Monterey
2 parents 60afcfa + 273dc98 commit ee01eef

File tree

2 files changed

+72
-127
lines changed

2 files changed

+72
-127
lines changed

‎.github/workflows/BuildPR.yml‎

Lines changed: 71 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -10,134 +10,12 @@ on:
1010

1111
jobs:
1212
buildMac:
13-
name: Build ${{ matrix.macos }} (${{ matrix.abi }}) with Qt${{ matrix.qt }}
14-
runs-on: ${{ matrix.macos }}
15-
strategy:
16-
fail-fast: false
17-
matrix:
18-
macos: [ macos-15-intel ]
19-
abi: [ x86 ]
20-
xcode: [ Xcode_26.0 ]
21-
qt: [ 5 ]
22-
steps:
23-
- name: Checkout
24-
uses: actions/checkout@v6
25-
with:
26-
fetch-depth: 0
27-
submodules: true
28-
- name: Investigate available XCode versions
29-
run: ls -n /Applications/ | grep Xcode*
30-
- name: Set XCode Version
31-
run: |
32-
sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
33-
xcodebuild -version
34-
xcode-select --print-path
35-
- name: Install build environment
36-
run: scripts/darwin/install_qt${{ matrix.qt }}.sh
37-
- name: Show cmake version
38-
run: cmake --version
39-
- name: Build project
40-
run: scripts/darwin/build_cmake_qt${{ matrix.qt }}.sh
41-
- name: Codesign app bundle
42-
if: "! github.event.pull_request.head.repo.fork " # not running on a fork
43-
# Extract the secrets we defined earlier as environment variables
44-
env:
45-
MACOS_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
46-
MACOS_CERTIFICATE_PWD: ${{ secrets.P12_PASSWORD }}
47-
MACOS_CERTIFICATE_NAME: ${{ secrets.APPLE_CERTIFICATE_NAME }}
48-
MACOS_CI_KEYCHAIN_PWD: ${{ secrets.KEYCHAIN_PASSWORD }}
49-
run: scripts/darwin/codesign.sh
50-
51-
- name: Notarize app bundle
52-
if: "! github.event.pull_request.head.repo.fork " # not running on a fork
53-
env:
54-
PROD_MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_ID }}
55-
PROD_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.TEAM_ID }}
56-
PROD_MACOS_NOTARIZATION_PWD: ${{ secrets.APP_PASSWORD }}
57-
run: scripts/darwin/notarize.sh
58-
59-
- name: Artifact Creation
60-
run: |
61-
cd /Users/runner/work/dlt-viewer/dlt-viewer/build
62-
mkdir -p dist
63-
cp ../scripts/darwin/install.md dist
64-
tar -czvf "dist/DLTViewer.tgz" -C /Users/runner/work/dlt-viewer/dlt-viewer/build/install .
65-
66-
- name: Archive upload
67-
uses: actions/upload-artifact@v7
68-
if: ${{ success() }}
69-
with:
70-
name: DLT-Mac-${{ matrix.abi }}
71-
path: build/dist/DLTViewer.tgz
72-
73-
buildUbuntu:
74-
name: Build ${{ matrix.ubuntu }}
75-
strategy:
76-
matrix:
77-
ubuntu: [ ubuntu-22.04, ubuntu-24.04 ]
78-
runs-on: ${{ matrix.ubuntu }}
79-
steps:
80-
- name: Checkout
81-
uses: actions/checkout@v6
82-
with:
83-
fetch-depth: 0
84-
submodules: true
85-
- name: install build environment
86-
run: scripts/linux/installUbuntu22and24.sh
87-
- name: Build project
88-
run: scripts/linux/buildUbuntu22and24.sh
89-
- name: Run tests
90-
run: ctest --test-dir build/qdlt
91-
- name: Create package
92-
if: ${{ matrix.ubuntu == 'ubuntu-24.04' }}
93-
run: ./build_viewer_debs_noble.sh
94-
- name: Archive artifact
95-
if: ${{ matrix.ubuntu == 'ubuntu-24.04' && success() }}
96-
uses: actions/upload-artifact@v7
97-
with:
98-
name: DLTViewer-Ubuntu-24.04
99-
path: debtmp/covesa-dlt-viewer_*.deb
100-
101-
buildWindows:
102-
name: Build Windows
103-
strategy:
104-
matrix:
105-
task: [ sdk ]
106-
qt: [ 6 ]
107-
runs-on: windows-2022
108-
steps:
109-
- name: Checkout
110-
uses: actions/checkout@v6
111-
with:
112-
fetch-depth: 0
113-
submodules: true
114-
- name: Install qt
115-
uses: jurplel/install-qt-action@v4
116-
with:
117-
modules: qtserialport
118-
- name: Build with CMake ${{ matrix.task }}
119-
run: >
120-
$env:WORKSPACE=$env:GITHUB_WORKSPACE;
121-
$env:CPACK_7Z="true";
122-
$env:CPACK_NSIS="true";
123-
./build_sdk_windows_qt${{ matrix.qt }}_MSVC_cmake.bat
124-
- name: Archive artifact
125-
uses: actions/upload-artifact@v7
126-
if: ${{ success() }}
127-
with:
128-
name: DLTViewer-windows-x86_64
129-
path: |
130-
build/dist/DLTViewer*.7z
131-
build/dist/DLTViewer*.exe
132-
build/dist/*.md
133-
134-
buildMacOSQt6:
13513
name: "Build MacOS ${{ matrix.osversion }} with Qt 6"
13614
runs-on: macos-${{ matrix.osversion }}
13715
strategy:
13816
fail-fast: false
13917
matrix:
140-
osversion: [ 14, 15 ]
18+
osversion: [ 14, 15, 15-intel ]
14119

14220
steps:
14321
- name: Checkout source
@@ -214,11 +92,73 @@ jobs:
21492
with:
21593
name: DLTViewer-macos${{ matrix.osversion }}-qt6
21694
path: build/dist/DLTViewer*.tgz
95+
96+
buildUbuntu:
97+
name: Build ${{ matrix.ubuntu }}
98+
strategy:
99+
matrix:
100+
ubuntu: [ ubuntu-22.04, ubuntu-24.04 ]
101+
runs-on: ${{ matrix.ubuntu }}
102+
steps:
103+
- name: Checkout
104+
uses: actions/checkout@v6
105+
with:
106+
fetch-depth: 0
107+
submodules: true
108+
- name: install build environment
109+
run: scripts/linux/installUbuntu22and24.sh
110+
- name: Build project
111+
run: scripts/linux/buildUbuntu22and24.sh
112+
- name: Run tests
113+
run: ctest --test-dir build/qdlt
114+
- name: Create package
115+
if: ${{ matrix.ubuntu == 'ubuntu-24.04' }}
116+
run: ./build_viewer_debs_noble.sh
117+
- name: Archive artifact
118+
if: ${{ matrix.ubuntu == 'ubuntu-24.04' && success() }}
119+
uses: actions/upload-artifact@v7
120+
with:
121+
name: DLTViewer-Ubuntu-24.04
122+
path: debtmp/covesa-dlt-viewer_*.deb
123+
124+
buildWindows:
125+
name: Build Windows
126+
strategy:
127+
matrix:
128+
task: [ sdk ]
129+
qt: [ 6 ]
130+
runs-on: windows-2022
131+
steps:
132+
- name: Checkout
133+
uses: actions/checkout@v6
134+
with:
135+
fetch-depth: 0
136+
submodules: true
137+
- name: Install qt
138+
uses: jurplel/install-qt-action@v4
139+
with:
140+
modules: qtserialport
141+
- name: Build with CMake ${{ matrix.task }}
142+
run: >
143+
$env:WORKSPACE=$env:GITHUB_WORKSPACE;
144+
$env:CPACK_7Z="true";
145+
$env:CPACK_NSIS="true";
146+
./build_sdk_windows_qt${{ matrix.qt }}_MSVC_cmake.bat
147+
- name: Archive artifact
148+
uses: actions/upload-artifact@v7
149+
if: ${{ success() }}
150+
with:
151+
name: DLTViewer-windows-x86_64
152+
path: |
153+
build/dist/DLTViewer*.7z
154+
build/dist/DLTViewer*.exe
155+
build/dist/*.md
156+
217157

218158
createRelease:
219159
name: Create release
220160
runs-on: ubuntu-24.04
221-
needs: [ buildMac, buildMacOSQt6, buildUbuntu, buildWindows ]
161+
needs: [ buildMac, buildUbuntu, buildWindows ]
222162
if: startsWith(github.ref, 'refs/tags/')
223163
steps:
224164
- name: Checkout
@@ -234,15 +174,20 @@ jobs:
234174
# name: DLT-Linux
235175
# continue-on-error: true
236176

237-
- name: Download DLT macOS artifacts arm64
177+
- name: Download DLT macOS 14 artifacts arm64
178+
uses: actions/download-artifact@v8
179+
with:
180+
name: DLTViewer-macos14-qt6
181+
182+
- name: Download DLT macOS 15 artifacts arm64
238183
uses: actions/download-artifact@v8
239184
with:
240185
name: DLTViewer-macos15-qt6
241186

242187
- name: Download DLT macOS artifacts x86
243188
uses: actions/download-artifact@v8
244189
with:
245-
name: DLT-Mac-x86
190+
name: DLTViewer-macos15-intel-qt6
246191

247192
- name: Download DLT Windows artifacts
248193
uses: actions/download-artifact@v8

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Developed with QT5 and Qt6 (<http://qt-project.org/>)
125125
Tested with Windows 11 + Qt 5.15.2 + Microsoft Visual Studio Build Tools 2019
126126
Tested with Windows 11 + Qt 6.7.3 + Microsoft Visual Studio Build Tools 2019
127127
Tested with Ubuntu Linux 24.04 + Qt 5.15.13
128-
Tested with macOS Catalina + Qt 5.15.13
128+
Tested with macOS Monterey + Qt 6.8.3
129129
Dynamically linked open source software
130130

131131
Qt 5.x.x (LGPLv3 - Qt)

0 commit comments

Comments
 (0)