Skip to content
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.

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

devcontainer: Update and add support for arm64 hosts #3282

Merged
merged 3 commits into from
Dec 5, 2023

Conversation

barrbrain
Copy link
Collaborator

@barrbrain barrbrain commented Nov 15, 2023

This will facilitate rebuild when a new Rust toolchain is released. We should sync with cargo-c releases.
Added support for linux/arm64 hosts to the prebuilt image.

@barrbrain barrbrain requested a review from lu-zero November 15, 2023 06:56
Copy link

codecov bot commented Nov 15, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (30c510e) 88.22% compared to head (9f4038c) 88.22%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #3282   +/-   ##
=======================================
  Coverage   88.22%   88.22%           
=======================================
  Files          87       87           
  Lines       28221    28221           
=======================================
  Hits        24898    24898           
  Misses       3323     3323           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

.devcontainer/Dockerfile Outdated Show resolved Hide resolved
@barrbrain barrbrain force-pushed the devcontainer-prebuilt branch 2 times, most recently from 7d8546a to e0ae71f Compare November 23, 2023 06:19
@barrbrain barrbrain force-pushed the devcontainer-prebuilt branch 2 times, most recently from f45a9a0 to 0f6a5dd Compare November 30, 2023 17:27
@barrbrain
Copy link
Collaborator Author

I verified the muilt-arch manifest on my fork:

docker manifest inspect ghcr.io/barrbrain/rav1e-devcontainer:latest
{
   "schemaVersion": 2,
   "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
   "manifests": [
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 3906,
         "digest": "sha256:b6a67286b6299678c40e9e6abd029dbac8da2382cb10c7e04c984532ae1dfa0b",
         "platform": {
            "architecture": "amd64",
            "os": "linux"
         }
      },
      {
         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
         "size": 3694,
         "digest": "sha256:f6e81cc7caadfff3e121c70daf70c48cddb72efa977873600d29237385dd6bfe",
         "platform": {
            "architecture": "arm64",
            "os": "linux"
         }
      }
   ]
}

@barrbrain
Copy link
Collaborator Author

barrbrain commented Dec 1, 2023

We could save a lot of build time by cross-compiling the cargo tools:

apt-get update
apt-get install -y libcurl4-openssl-dev:arm64 libssl-dev:arm64 zlib1g-dev:arm64
export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
export CARGO_PROFILE_RELEASE_STRIP=true
export CARGO_BUILD_TARGET=aarch64-unknown-linux-gnu
cargo install -q cargo-c --version "0.9.27+cargo-0.74.0"
cargo install -q cargo-criterion --version "1.1.0"
cargo install -q cargo-fuzz --version "0.11.2"
tar cf cargo-extra.tar /usr/local/cargo/.crates.toml \
  /usr/local/cargo/bin/{cargo-capi,cargo-cbuild,cargo-cinstall,cargo-ctest,cargo-criterion,cargo-fuzz}

@barrbrain barrbrain force-pushed the devcontainer-prebuilt branch 3 times, most recently from d3c2f5b to f2f1782 Compare December 1, 2023 15:15
@barrbrain barrbrain changed the title devcontainer: Explicitly bump the base image revision devcontainer: Update and add support for arm64 hosts Dec 4, 2023
Update Intel SDE to 9.27.0 and explicitly version all included tools.
This will trigger an image rebuild when a new toolchain is released.
@barrbrain barrbrain force-pushed the devcontainer-prebuilt branch from f2f1782 to 9f4038c Compare December 5, 2023 10:15
@barrbrain barrbrain merged commit 162a6de into xiph:master Dec 5, 2023
25 checks passed
@barrbrain barrbrain deleted the devcontainer-prebuilt branch December 5, 2023 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants