-
Notifications
You must be signed in to change notification settings - Fork 373
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
### What Add support for building a Linux ARM64 version of the CLI in our build system. - Follow-up to #5489 - Part of #4136 This PR introduces ugly work-around to be cleaned when our pixi deps support linux-aarch64: - #5507 ### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) * [x] I've included a screenshot or gif (if applicable) * [x] I have tested the web demo (if applicable): * Using newly built examples: [app.rerun.io](https://app.rerun.io/pr/5503/index.html) * Using examples from latest `main` build: [app.rerun.io](https://app.rerun.io/pr/5503/index.html?manifest_url=https://app.rerun.io/version/main/examples_manifest.json) * Using full set of examples from `nightly` build: [app.rerun.io](https://app.rerun.io/pr/5503/index.html?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json) * [x] The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG * [x] If applicable, add a new check to the [release checklist](https://github.com/rerun-io/rerun/blob/main/tests/python/release_checklist)! - [PR Build Summary](https://build.rerun.io/pr/5503) - [Docs preview](https://rerun.io/preview/65c8082ad0c5482bad9167e8620490494f80637e/docs) <!--DOCS-PREVIEW--> - [Examples preview](https://rerun.io/preview/65c8082ad0c5482bad9167e8620490494f80637e/examples) <!--EXAMPLES-PREVIEW--> - [Recent benchmark results](https://build.rerun.io/graphs/crates.html) - [Wasm size tracking](https://build.rerun.io/graphs/sizes.html) --------- Co-authored-by: Andreas Reich <[email protected]>
- Loading branch information
Showing
4 changed files
with
74 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,22 +21,25 @@ on: | |
| workflow_dispatch: | ||
| inputs: | ||
| ADHOC_NAME: | ||
| required: true | ||
| required: false | ||
| type: string | ||
| default: "" | ||
| description: "Name of the adhoc build, used for upload directory" | ||
| PLATFORM: | ||
| type: choice | ||
| options: | ||
| - linux | ||
| - windows | ||
| - macos-arm | ||
| - macos-intel | ||
| - linux-arm64 | ||
| - linux-x64 | ||
| - windows-x64 | ||
| - macos-arm64 | ||
| - macos-x64 | ||
| description: "Platform to build for" | ||
| required: true | ||
| CONCURRENCY: | ||
| required: false | ||
| type: string | ||
| default: "adhoc" | ||
| description: "Concurrency group to use" | ||
|
|
||
| concurrency: | ||
| group: ${{ inputs.CONCURRENCY }}-build-rerun-cli | ||
|
|
@@ -71,25 +74,31 @@ jobs: | |
| shell: bash | ||
| run: | | ||
| case "${{ inputs.PLATFORM }}" in | ||
| linux) | ||
| linux-arm64) | ||
| runner="buildjet-8vcpu-ubuntu-2204-arm" | ||
| target="aarch64-unknown-linux-gnu" | ||
| container="null" | ||
| bin_name="rerun" | ||
| ;; | ||
| linux-x64) | ||
| runner="ubuntu-latest-16-cores" | ||
| target="x86_64-unknown-linux-gnu" | ||
| container="{'image': 'rerunio/ci_docker:0.11.0'}" | ||
| bin_name="rerun" | ||
| ;; | ||
| windows) | ||
| windows-x64) | ||
| runner="windows-latest-8-cores" | ||
| target="x86_64-pc-windows-msvc" | ||
| container="null" | ||
| bin_name="rerun.exe" | ||
| ;; | ||
| macos-arm) | ||
| macos-arm64) | ||
| runner="macos-latest-large" # See https://github.blog/2023-10-02-introducing-the-new-apple-silicon-powered-m1-macos-larger-runner-for-github-actions/ | ||
| target="aarch64-apple-darwin" | ||
| container="null" | ||
| bin_name="rerun" | ||
| ;; | ||
| macos-intel) | ||
| macos-x64) | ||
| runner="macos-latest-large" # 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" | ||
|
|
@@ -138,16 +147,26 @@ jobs: | |
| targets: ${{ needs.set-config.outputs.TARGET }} | ||
|
|
||
| - uses: prefix-dev/[email protected] | ||
| if: ${{ inputs.PLATFORM != 'linux-arm64' }} # TODO(#5507): see below | ||
| with: | ||
| pixi-version: v0.13.0 | ||
|
|
||
| - name: Build web-viewer (release) | ||
| if: ${{ inputs.PLATFORM != 'linux-arm64' }} # TODO(#5507): see below | ||
| shell: bash | ||
| run: | | ||
| pixi run cargo run --locked -p re_build_web_viewer -- --release | ||
| # TODO(#5507): supress this workaround when pixi dependencies are available on linux-arm64 | ||
| - name: Build web-viewer (release, Linux ARM64) | ||
| if: ${{ inputs.PLATFORM == 'linux-arm64' }} | ||
| shell: bash | ||
| run: | | ||
| sudo apt-get install binaryen | ||
| cargo run --locked -p re_build_web_viewer -- --release | ||
| # This does not run in the pixi environment, doing so | ||
| # causes it to select the wrong compiler on macos-arm | ||
| # causes it to select the wrong compiler on macos-arm64 | ||
| - name: Build rerun-cli | ||
| shell: bash | ||
| env: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters