Skip to content

Commit b40f372

Browse files
committed
ci: bump mac and win build env
1 parent c4ce862 commit b40f372

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/workflows/ci-build.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -152,19 +152,19 @@ jobs:
152152
matrix:
153153
config:
154154
- os: macos
155-
os_version: 11
155+
os_version: 12
156156
qt_version: 5.15.2
157157
qt_modules:
158158
arch: x64
159159
artifacts_id: macos-qt5
160-
cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=10.14
160+
cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=11.7
161161
- os: macos
162-
os_version: 11
163-
qt_version: 6.5.1
162+
os_version: 12
163+
qt_version: 6.7.3
164164
qt_modules: qt5compat
165165
arch: x64
166166
artifacts_id: macos-qt6
167-
cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=10.15
167+
cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=11.7
168168

169169
runs-on: ${{ matrix.config.os }}-${{ matrix.config.os_version }}
170170
steps:
@@ -207,20 +207,20 @@ jobs:
207207
config:
208208
- os: windows
209209
os_version: 2022
210-
qt_version: 5.15.2
210+
qt_version: 6.7.3
211+
qt_modules: qt5compat
211212
arch: x64
212213
ssl_arch: -x64
213214
cmake_opts:
214-
artifacts_id: windows-x64-qt5
215+
artifacts_id: windows-x64-qt6
215216

216217
- os: windows
217218
os_version: 2022
218-
qt_version: 6.5.1
219-
qt_modules: qt5compat
219+
qt_version: 5.15.2
220220
arch: x64
221221
ssl_arch: -x64
222222
cmake_opts:
223-
artifacts_id: windows-x64-qt6
223+
artifacts_id: windows-x64-qt5
224224

225225
- os: windows
226226
os_version: 2022
@@ -239,12 +239,12 @@ jobs:
239239
uses: actions/cache@v2
240240
with:
241241
path: ${{ github.workspace }}\openssl-1.1
242-
key: OpensslCache-1-1-1n
242+
key: OpensslCache-1-1-1w
243243

244244
- name: Download openssl
245245
if: ${{ steps.cache-openssl.outputs.cache-hit != 'true' }}
246246
run: |
247-
Invoke-WebRequest -Uri "https://www.firedaemon.com/download-firedaemon-openssl-1-zip" -OutFile openssl.zip
247+
Invoke-WebRequest -Uri "https://www.firedaemon.com/download-firedaemon-openssl-1.1.1-zip" -OutFile openssl.zip
248248
7z x openssl.zip
249249
250250
- name: Set openssl paths

0 commit comments

Comments
 (0)