Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 0 additions & 20 deletions .github/workflows/adhoc_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ jobs:
PLATFORM: linux-x64
secrets: inherit

build-rerun-cli-and-upload-macos-x64:
name: "Mac-x64: Build & Upload rerun-cli"
uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
with:
CONCURRENCY: adhoc-wheels-macos-x64
PLATFORM: macos-x64
secrets: inherit

build-rerun-cli-and-upload-macos-arm64:
name: "Mac-arm64: Build & Upload rerun-cli"
uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
Expand Down Expand Up @@ -101,17 +93,6 @@ jobs:
MODE: ${{ inputs.MODE }}
secrets: inherit

build-wheel-macos-x64:
needs: [build-rerun-cli-and-upload-macos-x64]
name: "Macos-x64: Build & Upload Wheels"
uses: ./.github/workflows/reusable_build_and_upload_wheels.yml
with:
CONCURRENCY: adhoc-wheels-macos-x64
PLATFORM: macos-x64
WHEEL_ARTIFACT_NAME: "macos-x64-wheel"
MODE: ${{ inputs.MODE }}
secrets: inherit

build-wheel-windows-x64:
needs: [build-rerun-cli-and-upload-windows-x64]
name: "Windows-x64: Build & Upload Wheels"
Expand All @@ -132,7 +113,6 @@ jobs:
build-wheel-linux-arm64,
build-wheel-linux-x64,
build-wheel-macos-arm64,
build-wheel-macos-x64,
build-wheel-windows-x64,
]
uses: ./.github/workflows/reusable_pip_index.yml
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,6 @@ jobs:
PLATFORM: linux-x64
secrets: inherit

build-rerun_c-and-upload-macos-x64:
needs: [checks]
name: "Mac-Intel: Build & Upload rerun_c"
uses: ./.github/workflows/reusable_build_and_upload_rerun_c.yml
with:
CONCURRENCY: nightly-macos-x64
PLATFORM: macos-x64
secrets: inherit

build-rerun_c-and-upload-macos-arm64:
needs: [checks]
name: "Mac-Arm64: Build & Upload rerun_c"
Expand Down Expand Up @@ -170,15 +161,6 @@ jobs:
PLATFORM: linux-x64
secrets: inherit

build-rerun-cli-and-upload-macos-x64:
needs: [checks]
name: "Mac-x64: Build & Upload rerun-cli"
uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
with:
CONCURRENCY: nightly-macos-x64
PLATFORM: macos-x64
secrets: inherit

build-rerun-cli-and-upload-macos-arm64:
needs: [checks]
name: "Mac-arm64: Build & Upload rerun-cli"
Expand Down Expand Up @@ -233,17 +215,6 @@ jobs:
MODE: "pypi"
secrets: inherit

build-wheel-macos-x64:
needs: [checks, build-rerun-cli-and-upload-macos-x64]
name: "Macos-x64: Build & Upload Wheels"
uses: ./.github/workflows/reusable_build_and_upload_wheels.yml
with:
CONCURRENCY: nightly-macos-x64
PLATFORM: macos-x64
WHEEL_ARTIFACT_NAME: "macos-x64-wheel"
MODE: "pypi"
secrets: inherit

build-wheel-windows-x64:
needs: [checks, build-rerun-cli-and-upload-windows-x64]
name: "Windows-x64: Build & Upload Wheels"
Expand Down Expand Up @@ -288,17 +259,6 @@ jobs:
WHEEL_ARTIFACT_NAME: macos-arm64-wheel
secrets: inherit

# TODO(#9108): Test macos wheels
# test-wheel-macos-x64:
# needs: [checks, build-wheel-macos-x64]
# name: "macos-x64: Test Wheels"
# uses: ./.github/workflows/reusable_test_wheels.yml
# with:
# CONCURRENCY: nightly-macos-x64
# PLATFORM: macos-x64
# WHEEL_ARTIFACT_NAME: macos-x64-wheel
# secrets: inherit

test-wheel-windows-x64:
needs: [checks, build-wheel-windows-x64]
name: "Windows-x64: Test Wheels"
Expand Down Expand Up @@ -360,7 +320,6 @@ jobs:
build-wheel-linux-arm64,
build-wheel-linux-x64,
build-wheel-macos-arm64,
build-wheel-macos-x64,
build-wheel-windows-x64,
]
uses: ./.github/workflows/reusable_pip_index.yml
Expand All @@ -375,7 +334,6 @@ jobs:
build-rerun_c-and-upload-linux-arm64,
build-rerun_c-and-upload-linux-x64,
build-rerun_c-and-upload-macos-arm64,
build-rerun_c-and-upload-macos-x64,
build-rerun_c-and-upload-windows-x64,
]
uses: ./.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml
Expand All @@ -392,12 +350,10 @@ jobs:
build-rerun-cli-and-upload-linux-arm64,
build-rerun-cli-and-upload-linux-x64,
build-rerun-cli-and-upload-macos-arm64,
build-rerun-cli-and-upload-macos-x64,
build-rerun-cli-and-upload-windows-x64,
build-rerun_c-and-upload-linux-arm64,
build-rerun_c-and-upload-linux-x64,
build-rerun_c-and-upload-macos-arm64,
build-rerun_c-and-upload-macos-x64,
build-rerun_c-and-upload-windows-x64,
bundle-and-upload-rerun_cpp,
generate-pip-index,
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/reusable_build_and_upload_rerun_c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ on:
- linux-x64
- windows-x64
- macos-arm64
- macos-x64
description: "Platform to build for"
required: true
CONCURRENCY:
Expand Down Expand Up @@ -106,12 +105,6 @@ jobs:
container="null"
lib_name="librerun_c.a"
;;
macos-x64)
runner="macos-15" # Small runners, because building rerun_c is fast
target="x86_64-apple-darwin"
container="null"
lib_name="librerun_c.a"
;;
*) echo "Invalid platform" && exit 1 ;;
esac
echo "runner=$runner" >> "$GITHUB_OUTPUT"
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/reusable_build_and_upload_rerun_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ on:
- linux-x64
- windows-x64
- macos-arm64
- macos-x64
description: "Platform to build for"
required: true
CONCURRENCY:
Expand Down Expand Up @@ -108,12 +107,6 @@ jobs:
container="null"
bin_name="rerun"
;;
macos-x64)
runner="macos-15-xlarge" # See https://github.blog/2023-10-02-introducing-the-new-apple-silicon-powered-m1-macos-larger-runner-for-github-actions/
target="x86_64-apple-darwin"
container="null"
bin_name="rerun"
;;
*) echo "Invalid platform" && exit 1 ;;
esac
echo "runner=$runner" >> "$GITHUB_OUTPUT"
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/reusable_build_and_upload_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ on:
- linux-x64
- windows-x64
- macos-arm64
- macos-x64
description: "Platform to build for"
required: true
MODE:
Expand Down Expand Up @@ -127,12 +126,6 @@ jobs:
container="null"
compat="manylinux_2_28"
;;
macos-x64)
runner="macos-15-xlarge" # See https://github.blog/2023-10-02-introducing-the-new-apple-silicon-powered-m1-macos-larger-runner-for-github-actions/
target="x86_64-apple-darwin"
container="null"
compat="manylinux_2_28"
;;
*) echo "Invalid platform" && exit 1 ;;
esac
echo "runner=$runner" >> "$GITHUB_OUTPUT"
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/reusable_publish_rerun_c.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,6 @@ jobs:
RELEASE_COMMIT: ${{ inputs.release-commit }}
secrets: inherit

macos-x64:
name: "Mac-Intel"
uses: ./.github/workflows/reusable_build_and_upload_rerun_c.yml
with:
CONCURRENCY: publish-rerun-c-macos-x64-${{ github.ref_name }}
PLATFORM: macos-x64
RELEASE_COMMIT: ${{ inputs.release-commit }}
secrets: inherit

macos-arm64:
name: "Mac-Arm"
uses: ./.github/workflows/reusable_build_and_upload_rerun_c.yml
Expand All @@ -67,7 +58,7 @@ jobs:

bundle-and-upload-rerun_cpp:
name: "Bundle and upload rerun_cpp_sdk.zip"
needs: [linux-arm64, linux-x64, macos-x64, macos-arm64, windows-x64]
needs: [linux-arm64, linux-x64, macos-arm64, windows-x64]
uses: ./.github/workflows/reusable_bundle_and_upload_rerun_cpp.yml
with:
CONCURRENCY: bundle-rerun-c-${{ github.ref_name }}
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/reusable_publish_rerun_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,6 @@ jobs:
RELEASE_COMMIT: ${{ inputs.release-commit }}
secrets: inherit

macos-x64:
name: "Mac-Intel"
uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
with:
CONCURRENCY: publish-rerun-cli-macos-x64-${{ github.ref_name }}
PLATFORM: macos-x64
RELEASE_COMMIT: ${{ inputs.release-commit }}
secrets: inherit

macos-arm64:
name: "Mac-Arm"
uses: ./.github/workflows/reusable_build_and_upload_rerun_cli.yml
Expand Down
20 changes: 1 addition & 19 deletions .github/workflows/reusable_publish_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,6 @@ jobs:
MODE: "pypi"
secrets: inherit

build-macos-x64:
name: "Macos-x64: Build Wheels"
needs: [get-commit-sha]
uses: ./.github/workflows/reusable_build_and_upload_wheels.yml
with:
CONCURRENCY: wheels-build-macos-x64-${{ inputs.concurrency }}
PLATFORM: macos-x64
WHEEL_ARTIFACT_NAME: "macos-x64-wheel"
RELEASE_COMMIT: ${{ inputs.release-commit }}
MODE: "pypi"
secrets: inherit

## Test

test-windows-x64:
Expand Down Expand Up @@ -134,13 +122,7 @@ jobs:
generate-wheel-index:
name: "Generate Pip Index"
needs:
[
build-linux-x64,
build-linux-arm64,
build-windows-x64,
build-macos-arm64,
build-macos-x64,
]
[build-linux-x64, build-linux-arm64, build-windows-x64, build-macos-arm64]
uses: ./.github/workflows/reusable_pip_index.yml
with:
CONCURRENCY: generate-wheel-index-${{ inputs.concurrency }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/reusable_test_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,6 @@ jobs:
target="aarch64-apple-darwin"
container="null"
;;
macos-x64)
runner="macos-13-large" # This is an Intel vm, see https://docs.github.com/en/actions/using-github-hosted-runners/about-larger-runners/about-larger-runners#about-macos-larger-runners
target="x86_64-apple-darwin"
container="null"
;;
*) echo "Invalid platform" && exit 1 ;;
esac
echo "runner=$runner" >> "$GITHUB_OUTPUT"
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Rerun changelog


## 0.27.0 - TBD - TBD

### ⚠️ Breaking changes

- Minimum supported Python is now 3.10.
- Dropped support for Intel Mac


## [0.26.2](https://github.com/rerun-io/rerun/compare/0.26.1...0.26.2) - 2025-10-27 - More bug fixes

Expand Down
4 changes: 4 additions & 0 deletions crates/utils/re_log/src/setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ pub fn setup_logging_with_filter(log_filter: &str) {
always_enabled: env_var_bool("RERUN_PANIC_ON_WARN") == Some(true),
}))
.expect("Failed to install panic-on-warn logger");

if cfg!(target_os = "macos") && cfg!(target_arch = "x86_64") {
crate::warn!("Rerun does not officially support Intel Macs (x86/x64)");
}
}

#[cfg(target_arch = "wasm32")]
Expand Down
10 changes: 10 additions & 0 deletions docs/content/reference/migration/migration-0-27.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,17 @@ order: 983

<!-- ^^^ this number must be _decremented_ when you copy/paste this file -->

## Dropped support for Intel Macs
We've dropped official support for Intel (x86) maxOS in [PR #11719](https://github.com/rerun-io/rerun/pull/11719).

This means our Python pheels on PyPi.org and our other pre-built artifact does no longer include Intel Mac binaries.

You can still build Rerun from source.
There are instructions for that in [`BUILD.md`](https://github.com/rerun-io/rerun/blob/main/BUILD.md).


## Python SDK: minimum supported Python 3.10

Support for Python 3.9 is past end-of-life.
See https://docs.python.org/3/whatsnew/3.10.html for more details on upgrading to 3.10 if necessary.

1 change: 1 addition & 0 deletions rerun_cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ if(NOT TARGET rerun_c)

if(APPLE)
if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
message(WARNING "macOS x86 is officially unsupported by Rerun.")
set(RERUN_C_LIB_DEFAULT ${RERUN_C_DEFAULT_LIB_DIR}/librerun_c__macos_x64.a)
elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
set(RERUN_C_LIB_DEFAULT ${RERUN_C_DEFAULT_LIB_DIR}/librerun_c__macos_arm64.a)
Expand Down
1 change: 0 additions & 1 deletion rerun_cpp/cmake_setup_in_detail.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ If you want to match the behavior of `rerun_cpp_sdk.zip`, these libraries should
- Linux, x64: `librerun_c__linux_x64.a`
- Linux, Arm64: `librerun_c__linux_arm64.a`
- Windows, x64: `rerun_c__win_x64.lib`
- Mac, Intel: `librerun_c__macos_x64.a`
- Mac, Apple Silicon: `librerun_c__macos_arm64.a`

Or if you have a different build/download mechanism, you can point directly to the library by setting `RERUN_C_LIB`
Expand Down
1 change: 0 additions & 1 deletion scripts/ci/bundle_and_upload_rerun_cpp.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ def download_rerun_c(target_dir: str, git_hash: str, platform_filter: str | None
("linux-arm64/librerun_c.a", "librerun_c__linux_arm64.a"),
("linux-x64/librerun_c.a", "librerun_c__linux_x64.a"),
("macos-arm64/librerun_c.a", "librerun_c__macos_arm64.a"),
("macos-x64/librerun_c.a", "librerun_c__macos_x64.a"),
("windows-x64/rerun_c.lib", "rerun_c__win_x64.lib"),
]:
if platform_filter is not None and src.startswith(platform_filter) is False:
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci/fetch_artifact.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ def main() -> None:
choices=[
"linux-arm64",
"linux-x64",
"macos-x64",
"macos-arm64",
"windows-x64",
],
Expand All @@ -31,7 +30,6 @@ def main() -> None:
artifact_names: dict[tuple[str, str], str] = {}
artifact_names["rerun-cli", "linux-arm64"] = "rerun"
artifact_names["rerun-cli", "linux-x64"] = "rerun"
artifact_names["rerun-cli", "macos-x64"] = "rerun"
artifact_names["rerun-cli", "macos-arm64"] = "rerun"
artifact_names["rerun-cli", "windows-x64"] = "rerun.exe"

Expand Down
8 changes: 0 additions & 8 deletions scripts/ci/sync_release_assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,6 @@ def fetch_binary_assets(
f"librerun_c-{tag}-aarch64-apple-darwin.a",
f"commit/{commit_short}/rerun_c/macos-arm64/librerun_c.a",
),
(
f"librerun_c-{tag}-x86_64-apple-darwin.a",
f"commit/{commit_short}/rerun_c/macos-x64/librerun_c.a",
),
]
for name, blob_url in rerun_c_blobs:
blob = bucket.get_blob(blob_url)
Expand Down Expand Up @@ -167,10 +163,6 @@ def fetch_binary_assets(
f"rerun-cli-{tag}-aarch64-apple-darwin",
f"commit/{commit_short}/rerun-cli/macos-arm64/rerun",
),
(
f"rerun-cli-{tag}-x86_64-apple-darwin",
f"commit/{commit_short}/rerun-cli/macos-x64/rerun",
),
]
for name, blob_url in rerun_cli_blobs:
blob = bucket.get_blob(blob_url)
Expand Down
Loading
Loading