Skip to content

Update macOS minimum to 15 #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emlowe merged 4 commits into from
Mar 3, 2026
Merged

Update macOS minimum to 15 #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e834c38
Update macos to 15
emlowe Mar 2, 2026
dd8f00d
Update macos to 15
emlowe Mar 2, 2026
2d7b8b8
Update macos to 15
emlowe Mar 2, 2026
3d5628a
Fix macOS 15 CI failures after runner upgrade. (#327)
hoffmang9 Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-c-libraries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
- name: macOS
matrix: macos
runs-on:
arm: [macOS, ARM64]
intel: [macos-13-intel]
arm: [macos-15]
intel: [macos-15-intel]
- name: Ubuntu
matrix: ubuntu
runs-on:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, ubuntu-24.04-arm, macos-13-intel, macos-13-arm64, windows-latest]
os: [ubuntu-latest, ubuntu-24.04-arm, macos-15-intel, macos-15, windows-latest]
config: [optimized=1, TSAN=1, ASAN=1]
exclude:
- os: windows-latest
Expand Down Expand Up @@ -567,7 +567,7 @@ jobs:
run: |
set -euo pipefail

if [ "${{ matrix.os }}" = "macos-13-arm64" ]; then
if [ "${{ matrix.os }}" = "macos-15" ]; then
MACOS_ARCH="arm64"
else
MACOS_ARCH="intel"
Expand Down Expand Up @@ -751,7 +751,7 @@ jobs:
if: startsWith(matrix.os, 'macos') && matrix.config == 'optimized=1'
uses: actions/upload-artifact@v6
with:
name: ${{ matrix.os == 'macos-13-arm64' && 'macos-arm64-brew-bundle' || 'macos-intel-brew-bundle' }}
name: ${{ matrix.os == 'macos-15' && 'macos-arm64-brew-bundle' || 'macos-intel-brew-bundle' }}
path: |
dist/macos/*.zip
dist/macos/*.sha256
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
- name: macOS
matrix: macos
runs-on:
arm: [macos-13-arm64]
intel: [macos-13-intel]
arm: [macos-15]
intel: [macos-15-intel]
cibw-archs-macos:
arm: arm64
intel: x86_64
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ jobs:
- name: macOS
matrix: macos
runs-on:
arm: [macos-13-arm64]
intel: [macos-13-intel]
arm: [macos-15]
intel: [macos-15-intel]
cibw-archs-macos:
arm: arm64
intel: x86_64
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ brew_install_if_missing boost
brew_install_if_missing cmake
"""
before-build = "python -m pip install --upgrade pip"
environment = {MACOSX_DEPLOYMENT_TARGET="13", SYSTEM_VERSION_COMPAT=0, BUILD_VDF_CLIENT="N"}
environment = {MACOSX_DEPLOYMENT_TARGET="15", SYSTEM_VERSION_COMPAT=0, BUILD_VDF_CLIENT="N"}

[tool.cibuildwheel.windows]
build-verbosity = 0
Expand Down
1 change: 1 addition & 0 deletions src/Makefile.vdf-client
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ CXXFLAGS += $(LTO_FLAGS) -std=c++1z -D VDF_MODE=0 -D FAST_MACHINE=1 -pthread $(N
endif
ifeq ($(UNAME),Darwin)
CXXFLAGS += -D CHIAOSX=1
LDFLAGS += -Wl,-headerpad_max_install_names
# Homebrew (common on macOS) installs boost/gmp to /opt/homebrew or /usr/local
ifneq ($(wildcard /opt/homebrew/include/boost/asio.hpp),)
CXXFLAGS += -I/opt/homebrew/include
Expand Down
12 changes: 6 additions & 6 deletions src/threading.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,12 +458,12 @@ template<int d_expected_size, int d_padded_size> struct alignas(64) mpz {
bool operator>(const mpz_struct* t) const { return mpz_cmp(*this, t)>0; }
bool operator!=(const mpz_struct* t) const { return mpz_cmp(*this, t)!=0; }

bool operator<(int64 i) const { return mpz_cmp_si(*this, i)<0; }
bool operator<=(int64 i) const { return mpz_cmp_si(*this, i)<=0; }
bool operator==(int64 i) const { return mpz_cmp_si(*this, i)==0; }
bool operator>=(int64 i) const { return mpz_cmp_si(*this, i)>=0; }
bool operator>(int64 i) const { return mpz_cmp_si(*this, i)>0; }
bool operator!=(int64 i) const { return mpz_cmp_si(*this, i)!=0; }
bool operator<(int64 i) const { return mpz_cmp_si(_(), i)<0; }
bool operator<=(int64 i) const { return mpz_cmp_si(_(), i)<=0; }
bool operator==(int64 i) const { return mpz_cmp_si(_(), i)==0; }
bool operator>=(int64 i) const { return mpz_cmp_si(_(), i)>=0; }
bool operator>(int64 i) const { return mpz_cmp_si(_(), i)>0; }
bool operator!=(int64 i) const { return mpz_cmp_si(_(), i)!=0; }

bool operator<(uint64 i) const { return mpz_cmp_ui(_(), i)<0; }
bool operator<=(uint64 i) const { return mpz_cmp_ui(_(), i)<=0; }
Expand Down
Loading