Skip to content

Commit 9f981b9

Browse files
author
Terraphim CI
committed
fix(release): fix macOS runner and Docker firecracker deps
- Fix macOS x86_64: Change macos-13 to macos-12 (configuration not supported) - Fix Docker: Remove excluded firecracker crates before cargo fetch - Prevent cargo from trying to resolve private git dependencies
1 parent e020508 commit 9f981b9

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

.github/workflows/release-comprehensive.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
target: armv7-unknown-linux-musleabihf
112112
use_cross: true
113113
# macOS builds - use GitHub-hosted runners for building
114-
- os: macos-13
114+
- os: macos-12
115115
target: x86_64-apple-darwin
116116
use_cross: false
117117
- os: macos-14

docker/Dockerfile.multiarch

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,27 @@ COPY terraphim_server/Cargo.toml terraphim_server/
111111
RUN find crates -name Cargo.toml -exec dirname {} \; | while read dir; do \
112112
mkdir -p "$dir/src" && echo 'fn main() {}' > "$dir/src/lib.rs" || true; \
113113
done && \
114-
mkdir -p terraphim_server/src && echo 'fn main() {}' > terraphim_server/src/main.rs
114+
mkdir -p terraphim_server/src && echo 'fn main() {}' > "terraphim_server/src/main.rs"
115+
116+
# Remove excluded crates that have private git dependencies
117+
# These are excluded in workspace Cargo.toml but cargo fetch still sees them
118+
RUN rm -rf crates/terraphim_rlm crates/terraphim_github_runner crates/terraphim_github_runner_server 2>/dev/null || true
119+
RUN rm -rf terraphim_firecracker 2>/dev/null || true
115120

116121
# Pre-build dependencies
117122
RUN . /root/.profile && \
118123
RUST_TARGET=$(cat /tmp/rust-target) && \
119124
cargo fetch --target=$RUST_TARGET
120125

121-
# Copy source code
126+
# Copy source code (excluding crates with private dependencies)
122127
COPY crates ./crates
123128
COPY terraphim_server ./terraphim_server
124129
COPY --from=frontend-builder /app/dist ./terraphim_server/dist
125130

131+
# Remove excluded crates again after copy
132+
RUN rm -rf crates/terraphim_rlm crates/terraphim_github_runner crates/terraphim_github_runner_server 2>/dev/null || true
133+
RUN rm -rf terraphim_firecracker 2>/dev/null || true
134+
126135
# Build the application
127136
RUN . /root/.profile && \
128137
RUST_TARGET=$(cat /tmp/rust-target) && \

0 commit comments

Comments
 (0)