This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/main by this push:
new 6ff983d1c NO-JIRA: Update github actions build to use latest MacOSX
image
6ff983d1c is described below
commit 6ff983d1c3a67c8ffe3702d1e58d27697b3254a3
Author: Andrew Stitcher <[email protected]>
AuthorDate: Wed Dec 10 19:16:38 2025 -0500
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
---
.github/workflows/build.yml | 8 +++-----
CMakeLists.txt | 2 +-
azure-pipelines/azure-pipelines.yml | 1 -
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c2477b1b..5db098808 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
matrix:
os:
- ubuntu-24.04
- - macOS-13
+ - macOS-latest
- windows-latest
buildType:
- RelWithDebInfo
@@ -18,10 +18,8 @@ jobs:
- python_version: '3.11'
- os: windows-latest
cmake_extra: '-A x64
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake'
- - os: macOS-13
- pkg_config_path: '/usr/local/opt/[email protected]/lib/pkgconfig'
- cmake_extra: '-DBUILD_RUBY=no -DTHREADERCISER=ON'
- ctest_extra: '--exclude-regex c-threaderciser'
+ - os: macOS-latest
+ cmake_extra: '-DBUILD_RUBY=no'
env:
BuildType: ${{matrix.buildType}}
BuildDir: ${{github.workspace}}/BLD
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ddc9fe4b..0ad927b3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,7 @@ set (CXX_WARNING_MSVC "")
set (CATCH_UNDEFINED_Linux "-Wl,--no-undefined")
set (CATCH_UNDEFINED_FreeBSD "-Wl,--no-undefined")
-set (CATCH_UNDEFINED_Darwin "-Wl,-undefined,error")
+set (CATCH_UNDEFINED_Darwin "")
set (CATCH_UNDEFINED_Windows "")
set (HIDE_SYMBOLS_GNU "-fvisibility=hidden")
diff --git a/azure-pipelines/azure-pipelines.yml
b/azure-pipelines/azure-pipelines.yml
index 5c20c17b0..e106971f1 100644
--- a/azure-pipelines/azure-pipelines.yml
+++ b/azure-pipelines/azure-pipelines.yml
@@ -41,7 +41,6 @@ jobs:
- template: steps.yml
- job: MacOS
variables:
- PKG_CONFIG_PATH: '/usr/local/opt/[email protected]/lib/pkgconfig'
CmakeConfigExtraArgs: '-DBUILD_RUBY=no'
pool:
vmImage: 'macOS-latest'
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
