diff --git a/.github/workflows/build-darwin.yml b/.github/workflows/build-darwin.yml index 9dc02b91f7..e16be8814f 100644 --- a/.github/workflows/build-darwin.yml +++ b/.github/workflows/build-darwin.yml @@ -9,7 +9,7 @@ on: inputs: runs-on: type: string - default: macos-12-large + default: macos-13-large tag: type: string required: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7acf37682..203190c58f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: uses: ./.github/workflows/build-darwin.yml secrets: inherit with: - runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }} + runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-large' || 'macos-13' }} tag: darwin-x64 arch: x64 cpu: haswell @@ -95,7 +95,7 @@ jobs: uses: ./.github/workflows/build-darwin.yml secrets: inherit with: - runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }} + runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-large' || 'macos-13' }} tag: darwin-x64-baseline arch: x64 cpu: nehalem @@ -106,7 +106,7 @@ jobs: uses: ./.github/workflows/build-darwin.yml secrets: inherit with: - runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-12' }} + runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-13' }} tag: darwin-aarch64 arch: aarch64 cpu: native @@ -175,7 +175,7 @@ jobs: with: run-id: ${{ inputs.run-id }} pr-number: ${{ github.event.number }} - runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }} + runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-large' || 'macos-13' }} tag: darwin-x64 darwin-x64-baseline-test: if: ${{ inputs.run-id || github.event_name == 'pull_request' }} @@ -186,7 +186,7 @@ jobs: with: run-id: ${{ inputs.run-id }} pr-number: ${{ github.event.number }} - runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }} + runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-large' || 'macos-13' }} tag: darwin-x64-baseline darwin-aarch64-test: if: ${{ inputs.run-id || github.event_name == 'pull_request' }} @@ -197,7 +197,7 @@ jobs: with: run-id: ${{ inputs.run-id }} pr-number: ${{ github.event.number }} - runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-12' }} + runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-13' }} tag: darwin-aarch64 windows-x64-test: if: ${{ inputs.run-id || github.event_name == 'pull_request' }} diff --git a/.github/workflows/create-release-build.yml b/.github/workflows/create-release-build.yml index e9aa5796fe..42adea0585 100644 --- a/.github/workflows/create-release-build.yml +++ b/.github/workflows/create-release-build.yml @@ -90,7 +90,7 @@ jobs: uses: ./.github/workflows/build-darwin.yml secrets: inherit with: - runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }} + runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-large' || 'macos-13' }} tag: darwin-x64 arch: x64 cpu: haswell @@ -100,7 +100,7 @@ jobs: uses: ./.github/workflows/build-darwin.yml secrets: inherit with: - runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-12-large' || 'macos-12' }} + runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-large' || 'macos-13' }} tag: darwin-x64-baseline arch: x64 cpu: nehalem @@ -110,7 +110,7 @@ jobs: uses: ./.github/workflows/build-darwin.yml secrets: inherit with: - runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-12' }} + runs-on: ${{ github.repository_owner == 'oven-sh' && 'namespace-profile-bun-ci-darwin-aarch64' || 'macos-13' }} tag: darwin-aarch64 arch: aarch64 cpu: native diff --git a/.github/workflows/run-lint-cpp.yml b/.github/workflows/run-lint-cpp.yml index 12abea144b..7aae7eaacb 100644 --- a/.github/workflows/run-lint-cpp.yml +++ b/.github/workflows/run-lint-cpp.yml @@ -17,7 +17,7 @@ on: jobs: lint-cpp: name: Lint C++ - runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-xlarge' || 'macos-12' }} + runs-on: ${{ github.repository_owner == 'oven-sh' && 'macos-13-xlarge' || 'macos-13' }} steps: - name: Checkout uses: actions/checkout@v4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 70b8f52b67..18981fd5cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,7 @@ endif() # --- MacOS SDK --- if(APPLE AND DEFINED ENV{CI}) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") + set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0") endif() if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET) diff --git a/Makefile b/Makefile index 5f941249a9..c997d7da7b 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ ifeq ($(ARCH_NAME_RAW),arm64) ARCH_NAME = aarch64 DOCKER_BUILDARCH = arm64 BREW_PREFIX_PATH = /opt/homebrew -DEFAULT_MIN_MACOS_VERSION = 11.0 +DEFAULT_MIN_MACOS_VERSION = 13.0 MARCH_NATIVE = -mtune=$(CPU_TARGET) ifeq ($(OS_NAME),linux) MARCH_NATIVE = -march=armv8-a+crc -mtune=ampere1 diff --git a/scripts/env.sh b/scripts/env.sh index e86241c515..658f16ba8b 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -90,7 +90,7 @@ if [[ $(uname -s) == 'Linux' ]]; then fi if [[ $(uname -s) == 'Darwin' ]]; then - export CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET:-12.0} + export CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET:-13.0} CMAKE_FLAGS+=(-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}) export CFLAGS="$CFLAGS -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -D__DARWIN_NON_CANCELABLE=1 " diff --git a/src/bun.js/RuntimeTranspilerCache.zig b/src/bun.js/RuntimeTranspilerCache.zig index 9b57d24fb6..551659c6e0 100644 --- a/src/bun.js/RuntimeTranspilerCache.zig +++ b/src/bun.js/RuntimeTranspilerCache.zig @@ -201,7 +201,7 @@ pub const RuntimeTranspilerCache = struct { try metadata.encode(metadata_stream.writer()); - if (comptime bun.Environment.allow_assert) { + if (comptime bun.Environment.isDebug) { var metadata_stream2 = std.io.fixedBufferStream(metadata_buf[0..Metadata.size]); var metadata2 = Metadata{}; metadata2.decode(metadata_stream2.reader()) catch |err| bun.Output.panic("Metadata did not roundtrip encode -> decode successfully: {s}", .{@errorName(err)});