Skip to content

Commit 919e6d0

Browse files
committed
Merge bitcoin#33489: build: Drop support for EOL macOS 13
1aaaaa0 fuzz: Drop unused workaround after Apple-Clang bump (MarcoFalke) fadad7a Drop support for EOL macOS 13 (MarcoFalke) Pull request description: Now that macOS 13 is EOL (https://en.wikipedia.org/wiki/MacOS_Ventura), it seems odd to still support it. (macOS Ventura 13.7.8 received its final security update on 20 Aug 2025: https://support.apple.com/en-us/100100) This patch will only be released in version 31.x, another 6 months out from now. So: * Update the depends build and release note template to drop EOL macOS 13. * As a result, update the earliest Xcode to version 16 in CI. * Also, bump the macOS CI runner to version 15, to avoid issues when version 14 will be at its EOL in about 1 year. This also allows to drop a small workaround in the fuzz tests and unlocks libcpp hardening (bitcoin#33462) ACKs for top commit: stickies-v: re-ACK 1aaaaa0 l0rinc: code review ACK 1aaaaa0 hodlinator: re-ACK 1aaaaa0 hebasto: ACK 1aaaaa0. Tree-SHA512: 6d247a8432ef8ea8c6ff2a221472b278f8344346b172980299507f9898bb9e8e16480c128b1f4ca692bcbcc393da2b2fd6895ac5f118bc09e0f30f910529d20c
2 parents 452ea59 + 1aaaaa0 commit 919e6d0

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
name: ${{ matrix.job-name }}
106106
# Use any image to support the xcode-select below, but hardcode version to avoid silent upgrades (and breaks).
107107
# See: https://github.com/actions/runner-images#available-images.
108-
runs-on: macos-14
108+
runs-on: macos-15
109109

110110
# When a contributor maintains a fork of the repo, any pull request they make
111111
# to their own fork, or to the main repository, will trigger two CI runs:
@@ -123,10 +123,10 @@ jobs:
123123
include:
124124
- job-type: standard
125125
file-env: './ci/test/00_setup_env_mac_native.sh'
126-
job-name: 'macOS 14 native, arm64, no depends, sqlite only, gui'
126+
job-name: 'macOS native, no depends, sqlite only, gui'
127127
- job-type: fuzz
128128
file-env: './ci/test/00_setup_env_mac_native_fuzz.sh'
129-
job-name: 'macOS 14 native, arm64, fuzz'
129+
job-name: 'macOS native, fuzz'
130130

131131
env:
132132
DANGER_RUN_CI_ON_HOST: 1
@@ -145,8 +145,8 @@ jobs:
145145
# Use the earliest Xcode supported by the version of macOS denoted in
146146
# doc/release-notes-empty-template.md and providing at least the
147147
# minimum clang version denoted in doc/dependencies.md.
148-
# See: https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes
149-
sudo xcode-select --switch /Applications/Xcode_15.0.app
148+
# See: https://developer.apple.com/documentation/xcode-release-notes/xcode-16-release-notes
149+
sudo xcode-select --switch /Applications/Xcode_16.0.app
150150
clang --version
151151
152152
- name: Install Homebrew packages

contrib/guix/symbol-check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def check_MACHO_libraries(binary) -> bool:
248248
return ok
249249

250250
def check_MACHO_min_os(binary) -> bool:
251-
if binary.build_version.minos == [13,0,0]:
251+
if binary.build_version.minos == [14,0,0]:
252252
return True
253253
return False
254254

depends/hosts/darwin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OSX_MIN_VERSION=13.0
1+
OSX_MIN_VERSION=14.0
22
OSX_SDK_VERSION=14.0
33
XCODE_VERSION=15.0
44
XCODE_BUILD_ID=15A240d

doc/release-notes-empty-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Compatibility
3636
==============
3737

3838
Bitcoin Core is supported and tested on operating systems using the
39-
Linux Kernel 3.17+, macOS 13+, and Windows 10+. Bitcoin
39+
Linux Kernel 3.17+, macOS 14+, and Windows 10+. Bitcoin
4040
Core should also work on most other Unix-like systems but is not as
4141
frequently tested on them. It is not recommended to use Bitcoin Core on
4242
unsupported systems.

share/qt/Info.plist.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="0.9">
44
<dict>
55
<key>LSMinimumSystemVersion</key>
6-
<string>13</string>
6+
<string>14</string>
77

88
<key>LSArchitecturePriority</key>
99
<array>

src/test/fuzz/fuzz.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ auto& FuzzTargets()
7575

7676
void FuzzFrameworkRegisterTarget(std::string_view name, TypeTestOneInput target, FuzzTargetOptions opts)
7777
{
78-
const auto [it, ins]{FuzzTargets().try_emplace(name, FuzzTarget /* temporary can be dropped after Apple-Clang-16 ? */ {std::move(target), std::move(opts)})};
78+
const auto [it, ins]{FuzzTargets().try_emplace(name, std::move(target), std::move(opts))};
7979
Assert(ins);
8080
}
8181

0 commit comments

Comments
 (0)