Skip to content

Commit 6ff983d

Browse files
committed
NO-JIRA: Update github actions build to use latest MacOSX image
- Also stop Azure dev MacOS build using wrong version of OpenSSL - Remove deprecated MacOSX linker flag
1 parent 67b5455 commit 6ff983d

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,16 @@ jobs:
1010
matrix:
1111
os:
1212
- ubuntu-24.04
13-
- macOS-13
13+
- macOS-latest
1414
- windows-latest
1515
buildType:
1616
- RelWithDebInfo
1717
include:
1818
- python_version: '3.11'
1919
- os: windows-latest
2020
cmake_extra: '-A x64 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake'
21-
- os: macOS-13
22-
pkg_config_path: '/usr/local/opt/openssl@1.1/lib/pkgconfig'
23-
cmake_extra: '-DBUILD_RUBY=no -DTHREADERCISER=ON'
24-
ctest_extra: '--exclude-regex c-threaderciser'
21+
- os: macOS-latest
22+
cmake_extra: '-DBUILD_RUBY=no'
2523
env:
2624
BuildType: ${{matrix.buildType}}
2725
BuildDir: ${{github.workspace}}/BLD

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ set (CXX_WARNING_MSVC "")
241241

242242
set (CATCH_UNDEFINED_Linux "-Wl,--no-undefined")
243243
set (CATCH_UNDEFINED_FreeBSD "-Wl,--no-undefined")
244-
set (CATCH_UNDEFINED_Darwin "-Wl,-undefined,error")
244+
set (CATCH_UNDEFINED_Darwin "")
245245
set (CATCH_UNDEFINED_Windows "")
246246

247247
set (HIDE_SYMBOLS_GNU "-fvisibility=hidden")

azure-pipelines/azure-pipelines.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
- template: steps.yml
4242
- job: MacOS
4343
variables:
44-
PKG_CONFIG_PATH: '/usr/local/opt/openssl@1.1/lib/pkgconfig'
4544
CmakeConfigExtraArgs: '-DBUILD_RUBY=no'
4645
pool:
4746
vmImage: 'macOS-latest'

0 commit comments

Comments
 (0)