Skip to content

Commit 80cecbe

Browse files
committed
mac: test build with target ver 10.15
1 parent a0a9d35 commit 80cecbe

5 files changed

Lines changed: 9 additions & 184 deletions

File tree

.github/workflows/build.linux.workflow.yml

Lines changed: 0 additions & 68 deletions
This file was deleted.

.github/workflows/build.mac.workflow.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ name: Build macOS
22

33
on:
44
push:
5-
branches: [ master, feature/github-actions ]
6-
pull_request:
7-
branches: [ master, feature/github-actions ]
5+
branches: [ ci_old_macos ]
86

97
jobs:
108
build:
@@ -13,25 +11,17 @@ jobs:
1311
strategy:
1412
fail-fast: false
1513
matrix:
16-
os: [macos-12, macos-13, macos-14]
14+
os: [macos-15-intel]
1715
config: [Release]
1816
include:
19-
- os: macos-12
17+
- os: macos-15-intel
2018
arch: x64
2119
qtver: Qt5
2220
qtvershort: "5_intel"
23-
- os: macos-13
24-
arch: x64
25-
qtver: Qt6
26-
qtvershort: "6_intel"
27-
- os: macos-14
28-
arch: arm64
29-
qtver: Qt6
30-
qtvershort: "6_arm"
3121

3222
steps:
3323
- name: Checkout Git Repo
34-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
3525
with:
3626
submodules: 'recursive'
3727

@@ -109,7 +99,7 @@ jobs:
10999
xcrun stapler staple "CEmu-v2.0_mac_qt${{matrix.qtvershort}}.dmg"
110100
111101
- name: Upload dmg as artifact
112-
uses: actions/upload-artifact@v3
102+
uses: actions/upload-artifact@v4
113103
with:
114104
name: CEmu-v2.0_mac_qt${{matrix.qtvershort}}
115105
path: CEmu-v2.0_mac_qt${{matrix.qtvershort}}.dmg

.github/workflows/build.windows.workflow.yml

Lines changed: 0 additions & 65 deletions
This file was deleted.

.github/workflows/coverity.workflow.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

gui/qt/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ option(USE_QT5 "Build with Qt5 instead of Qt6" OFF)
44

55
if(USE_QT5)
66
list(APPEND VCPKG_MANIFEST_FEATURES "qt5")
7+
set(VCPKG_OSX_DEPLOYMENT_TARGET "10.15")
8+
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
9+
set(ENV{MACOSX_DEPLOYMENT_TARGET} "10.15")
10+
set(ENV{VCPKG_KEEP_ENV_VARS} "MACOSX_DEPLOYMENT_TARGET")
711
else()
812
list(APPEND VCPKG_MANIFEST_FEATURES "qt6")
913
endif()

0 commit comments

Comments
 (0)