Merge pull request #136 from traintastic/ci-macos-13
CI: remove macos-11, add macos-13
Dieser Commit ist enthalten in:
Commit
ad1b62e151
20
.github/workflows/build.yml
vendored
20
.github/workflows/build.yml
vendored
@ -60,8 +60,8 @@ jobs:
|
|||||||
build_deb: true
|
build_deb: true
|
||||||
defines: "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
|
defines: "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
|
||||||
|
|
||||||
- name: "macos-11"
|
- name: "macos-12"
|
||||||
os: "macos-11"
|
os: "macos-12"
|
||||||
generator: "Unix Makefiles"
|
generator: "Unix Makefiles"
|
||||||
arch: ""
|
arch: ""
|
||||||
target: traintastic-client
|
target: traintastic-client
|
||||||
@ -70,12 +70,12 @@ jobs:
|
|||||||
build_deb: false
|
build_deb: false
|
||||||
defines: ""
|
defines: ""
|
||||||
|
|
||||||
- name: "macos-12"
|
- name: "macos-13"
|
||||||
os: "macos-12"
|
os: "macos-13"
|
||||||
generator: "Unix Makefiles"
|
generator: "Unix Makefiles"
|
||||||
arch: ""
|
arch: ""
|
||||||
target: traintastic-client
|
target: traintastic-client
|
||||||
jobs: 3
|
jobs: 4
|
||||||
build_type: Release
|
build_type: Release
|
||||||
build_deb: false
|
build_deb: false
|
||||||
defines: ""
|
defines: ""
|
||||||
@ -257,8 +257,8 @@ jobs:
|
|||||||
defines: "-DINSTALL_SYSTEMD_SERVICE=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
|
defines: "-DINSTALL_SYSTEMD_SERVICE=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
|
||||||
ccov: false
|
ccov: false
|
||||||
|
|
||||||
- name: "macos-11"
|
- name: "macos-12"
|
||||||
os: "macos-11"
|
os: "macos-12"
|
||||||
generator: "Unix Makefiles"
|
generator: "Unix Makefiles"
|
||||||
arch: ""
|
arch: ""
|
||||||
toolset: ""
|
toolset: ""
|
||||||
@ -269,13 +269,13 @@ jobs:
|
|||||||
defines: ""
|
defines: ""
|
||||||
ccov: false
|
ccov: false
|
||||||
|
|
||||||
- name: "macos-12"
|
- name: "macos-13"
|
||||||
os: "macos-12"
|
os: "macos-13"
|
||||||
generator: "Unix Makefiles"
|
generator: "Unix Makefiles"
|
||||||
arch: ""
|
arch: ""
|
||||||
toolset: ""
|
toolset: ""
|
||||||
target: all
|
target: all
|
||||||
jobs: 3
|
jobs: 4
|
||||||
build_type: Release
|
build_type: Release
|
||||||
build_deb: false
|
build_deb: false
|
||||||
defines: ""
|
defines: ""
|
||||||
|
|||||||
@ -222,6 +222,10 @@ else()
|
|||||||
list(REMOVE_ITEM SOURCES ${SOCKET_CAN_SOURCES})
|
list(REMOVE_ITEM SOURCES ${SOCKET_CAN_SOURCES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(APPLE)
|
||||||
|
add_definitions(-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION) # remove once boost is updated
|
||||||
|
endif()
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
add_definitions(-D_WIN32_WINNT=0x0601)
|
add_definitions(-D_WIN32_WINNT=0x0601)
|
||||||
file(GLOB SOURCES_WINDOWS "src/os/windows/*.hpp" "src/os/windows/*.cpp")
|
file(GLOB SOURCES_WINDOWS "src/os/windows/*.hpp" "src/os/windows/*.cpp")
|
||||||
|
|||||||
Laden…
x
In neuem Issue referenzieren
Einen Benutzer sperren