chore: add standalone toolchain build scripts #2400

NathanFlurry · 2025-04-26T08:43:47Z

Changes

NathanFlurry · 2025-04-26T08:44:04Z

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more

chore: add standalone toolchain build scripts #2400 : 2 dependent PRs (#2500 , #2501 ) 👈 (View in Graphite)
refactor: replace unsafe File::from_raw_fd with safe File::from #2479
main

How to use the Graphite Merge Queue

Add the label merge-queue to this PR to add it to the merge queue.

You must have a Graphite account in order to use the merge queue. Sign up using this link.

_{An organization admin has enabled the Graphite Merge Queue in this repository.} _{Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.}

This stack of pull requests is managed by Graphite. Learn more about stacking.

greptile-apps

PR Summary

Added comprehensive cross-platform build system for the Rivet CLI, enabling static binary compilation for Linux, macOS (x86_64/ARM64), and Windows platforms using Docker-based toolchains.

Added /docker/toolchain/linux.Dockerfile with musl-based static linking and OpenSSL 1.1.1w configuration for portable Linux builds
Added /docker/toolchain/macos.Dockerfile with osxcross toolchain setup for both x86_64 and ARM64 macOS builds
Added /docker/toolchain/windows.Dockerfile with MinGW-w64 cross-compilation support for Windows builds
Added /docker/toolchain/build.sh with unified build orchestration supporting platform-specific compilation flags
Simplified Sentry integration in /packages/toolchain/cli/Cargo.toml by reducing feature flags to core functionality

_{7 file(s) reviewed, 6 comment(s)}
_{Edit PR Review Bot Settings | Greptile}

greptile-apps · 2025-04-26T08:44:41Z

docker/toolchain/linux.Dockerfile

+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+	--mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/build/target \


syntax: Inconsistent indentation between lines (tab vs spaces)

greptile-apps · 2025-04-26T08:44:42Z

docker/toolchain/Dockerfile

+RUN for platform in ${PLATFORMS}; do \
+    echo "Building for $platform..." && \
+    cargo build --bin rivet --release --target $platform; \
+    done


logic: Build process should check for and handle build failures for individual platforms instead of continuing silently

Suggested change

RUN for platform in ${PLATFORMS}; do \

echo "Building for $platform..." && \

cargo build --bin rivet --release --target $platform; \

done

RUN for platform in ${PLATFORMS}; do \

echo "Building for $platform..." && \

cargo build --bin rivet --release --target $platform || exit 1; \

done

greptile-apps · 2025-04-26T08:45:04Z

docker/toolchain/build.sh

+    BINARY="rivet-x86-linux"
+    ;;
+  macos)
+    if [ "$ARCH" == "arm64" ] || [ "$ARCH" == "aarch64" ]; then


style: Use single equals for string comparison in shell scripts for better POSIX compatibility

Suggested change

if [ "$ARCH" == "arm64" ] || [ "$ARCH" == "aarch64" ]; then

if [ "$ARCH" = "arm64" ] || [ "$ARCH" = "aarch64" ]; then

greptile-apps · 2025-04-26T08:45:19Z

docker/toolchain/macos.Dockerfile

+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/build/target \


logic: Cache mounts should be unique per architecture to prevent potential conflicts between x86_64 and ARM64 builds

greptile-apps · 2025-04-26T08:45:38Z

docker/toolchain/setup.sh

+UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh
+echo 'export PATH="/root/osxcross/target/bin:$PATH"' >> ~/.bashrc


logic: PATH modification in .bashrc won't take effect in non-interactive shells. Consider exporting PATH directly in the script.

Suggested change

UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh

echo 'export PATH="/root/osxcross/target/bin:$PATH"' >> ~/.bashrc

UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh

export PATH="/root/osxcross/target/bin:$PATH"

greptile-apps · 2025-04-26T08:46:01Z

docker/toolchain/windows.Dockerfile

+ENV CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=x86_64-w64-mingw32-gcc \
+    RUSTFLAGS="--cfg tokio_unstable" \
+    CARGO_INCREMENTAL=0 \
+    CARGO_NET_GIT_FETCH_WITH_CLI=true


style: Consider adding CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUSTFLAGS to ensure Windows-specific flags are properly isolated from other targets

cloudflare-workers-and-pages · 2025-04-26T08:47:27Z

Deploying rivet with Cloudflare Pages

Latest commit:	`2c043a5`
Status:	✅ Deploy successful!
Preview URL:	https://96d03f02.rivet.pages.dev
Branch Preview URL:	https://04-26-chore-add-standalone-t.rivet.pages.dev

View logs

NathanFlurry · 2025-04-26T10:40:00Z

Dockerfiles don't work identical to GitHub Actions, unsure why

greptile-apps

PR Summary

The PR updates the release workflow to integrate the new standalone toolchain build system, focusing on Docker-based builds and artifact management.

Modified .github/workflows/release.yaml to use new Docker-based toolchain scripts instead of direct dependency installation
Added R2 storage integration for binary artifacts with AWS CLI configuration in release workflow
Added platform-specific build matrix configuration with ARM64 support for macOS builds
Streamlined Docker image tagging and pushing with consistent naming conventions across architectures

_{8 file(s) reviewed, 1 comment(s)}
_{Edit PR Review Bot Settings | Greptile}

greptile-apps · 2025-04-26T11:24:38Z

docker/toolchain/linux.Dockerfile

+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+	--mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=/build/target \
+    cargo build --bin rivet --release --target x86_64-unknown-linux-musl -v && \


style: Add --locked flag to cargo build to ensure reproducible builds

Suggested change

cargo build --bin rivet --release --target x86_64-unknown-linux-musl -v && \

cargo build --bin rivet --release --target x86_64-unknown-linux-musl --locked -v && \

cloudflare-workers-and-pages · 2025-04-26T12:12:07Z

Deploying rivet-hub with Cloudflare Pages

Latest commit:	`2c043a5`
Status:	✅ Deploy successful!
Preview URL:	https://5c6a8006.rivet-hub-7jb.pages.dev
Branch Preview URL:	https://04-26-chore-add-standalone-t.rivet-hub-7jb.pages.dev

View logs

cloudflare-workers-and-pages · 2025-04-26T12:15:12Z

Deploying rivet-studio with Cloudflare Pages

Latest commit:	`2c043a5`
Status:	✅ Deploy successful!
Preview URL:	https://3b4725ba.rivet-studio.pages.dev
Branch Preview URL:	https://04-26-chore-add-standalone-t.rivet-studio.pages.dev

View logs

NathanFlurry mentioned this pull request Apr 26, 2025

chore: update release please #2399

Merged

NathanFlurry force-pushed the 04-26-chore_add_standalone_toolchain_build_scripts branch from d341e1a to e987134 Compare April 26, 2025 08:44

greptile-apps bot reviewed Apr 26, 2025

View reviewed changes

NathanFlurry force-pushed the 04-26-chore_add_standalone_toolchain_build_scripts branch 2 times, most recently from c0718f7 to 90ca82c Compare April 26, 2025 09:18

NathanFlurry changed the base branch from 04-26-chore_update_release_please to graphite-base/2400 April 26, 2025 10:39

NathanFlurry closed this Apr 26, 2025

NathanFlurry reopened this Apr 26, 2025

greptile-apps bot reviewed Apr 26, 2025

View reviewed changes

NathanFlurry force-pushed the 04-26-chore_add_standalone_toolchain_build_scripts branch from 90ca82c to 78080b4 Compare April 26, 2025 11:54

NathanFlurry force-pushed the graphite-base/2400 branch from 4648476 to ff549fe Compare April 26, 2025 11:55

NathanFlurry changed the base branch from graphite-base/2400 to main April 26, 2025 11:55

This was referenced Apr 26, 2025

chore: temporarily disable sentry #2406

Closed

chore: switch to building toolchain with dockerfiles instead of github actions #2407

Closed

NathanFlurry changed the base branch from main to graphite-base/2400 April 26, 2025 12:12

NathanFlurry force-pushed the 04-26-chore_add_standalone_toolchain_build_scripts branch from 78080b4 to 37a6983 Compare April 26, 2025 12:12

NathanFlurry changed the base branch from graphite-base/2400 to 04-26-chore_temporarily_disable_sentry April 26, 2025 12:12

graphite-app bot changed the base branch from 04-26-chore_temporarily_disable_sentry to graphite-base/2400 April 26, 2025 12:16

graphite-app bot force-pushed the graphite-base/2400 branch from e029e29 to 0a94837 Compare April 26, 2025 12:16

graphite-app bot force-pushed the 04-26-chore_add_standalone_toolchain_build_scripts branch from 37a6983 to e0734e0 Compare April 26, 2025 12:16

graphite-app bot changed the base branch from graphite-base/2400 to main April 26, 2025 12:17

graphite-app bot force-pushed the 04-26-chore_add_standalone_toolchain_build_scripts branch from e0734e0 to 332e7ff Compare April 26, 2025 12:17

NathanFlurry force-pushed the 04-26-chore_add_standalone_toolchain_build_scripts branch 3 times, most recently from 08ade41 to d7e0071 Compare May 27, 2025 17:41

graphite-app bot closed this Jun 3, 2025

graphite-app bot deleted the 04-26-chore_add_standalone_toolchain_build_scripts branch June 3, 2025 07:03

github-actions bot mentioned this pull request Jun 3, 2025

chore(main): release 25.5.1 #2423

Merged

	if [ "$ARCH" == "arm64" ] \|\| [ "$ARCH" == "aarch64" ]; then
	if [ "$ARCH" = "arm64" ] \|\| [ "$ARCH" = "aarch64" ]; then

		UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh
		echo 'export PATH="/root/osxcross/target/bin:$PATH"' >> ~/.bashrc

	cargo build --bin rivet --release --target x86_64-unknown-linux-musl -v && \
	cargo build --bin rivet --release --target x86_64-unknown-linux-musl --locked -v && \

chore: add standalone toolchain build scripts #2400

chore: add standalone toolchain build scripts #2400

Uh oh!

Conversation

NathanFlurry commented Apr 26, 2025

Changes

Uh oh!

NathanFlurry commented Apr 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How to use the Graphite Merge Queue

Uh oh!

greptile-apps bot left a comment

Choose a reason for hiding this comment

PR Summary

Uh oh!

greptile-apps bot Apr 26, 2025

Choose a reason for hiding this comment

Uh oh!

greptile-apps bot Apr 26, 2025

Choose a reason for hiding this comment

Uh oh!

greptile-apps bot Apr 26, 2025

Choose a reason for hiding this comment

Uh oh!

greptile-apps bot Apr 26, 2025

Choose a reason for hiding this comment

Uh oh!

greptile-apps bot Apr 26, 2025

Choose a reason for hiding this comment

Uh oh!

greptile-apps bot Apr 26, 2025

Choose a reason for hiding this comment

Uh oh!

cloudflare-workers-and-pages bot commented Apr 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying rivet with Cloudflare Pages

Uh oh!

NathanFlurry commented Apr 26, 2025

Uh oh!

greptile-apps bot left a comment

Choose a reason for hiding this comment

PR Summary

Uh oh!

greptile-apps bot Apr 26, 2025

Choose a reason for hiding this comment

Uh oh!

cloudflare-workers-and-pages bot commented Apr 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying rivet-hub with Cloudflare Pages

Uh oh!

cloudflare-workers-and-pages bot commented Apr 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying rivet-studio with Cloudflare Pages

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

NathanFlurry commented Apr 26, 2025 •

edited

Loading

cloudflare-workers-and-pages bot commented Apr 26, 2025 •

edited

Loading

cloudflare-workers-and-pages bot commented Apr 26, 2025 •

edited

Loading

cloudflare-workers-and-pages bot commented Apr 26, 2025 •

edited

Loading