Skip to content

Commit

Permalink
Merge branch 'main-live-migration-pvm' into main-live-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
pojntfx committed Nov 28, 2024
2 parents 350ea99 + e65e30f commit 29497ec
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/hydrun.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
# Binaries
- id: rust.x86_64
src: .
os: alpine:edge
os: public.ecr.aws/firecracker/fcuvm:v75
flags: ""
cmd: ./Hydrunfile rust x86_64
dst: out/*
runner: depot-ubuntu-22.04-32
- id: rust.aarch64
src: .
os: alpine:edge
os: public.ecr.aws/firecracker/fcuvm:v75
flags: ""
cmd: ./Hydrunfile rust aarch64
dst: out/*
Expand Down
10 changes: 3 additions & 7 deletions Hydrunfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
#!/bin/sh
#!/bin/bash

set -e

# Rust
if [ "$1" = "rust" ]; then
# Install native dependencies
apk add rust cargo clang-dev cmake linux-headers make git

# Configure Git
git config --global --add safe.directory '*'

# Build
cp "resources/seccomp/$2-unknown-linux-musl.json" "resources/seccomp/$2-alpine-linux-musl.json"
export RUSTFLAGS='-C target-feature=+crt-static'
cargo build --package firecracker --package jailer --package seccompiler --package rebase-snap --package cpu-template-helper --target "$2-alpine-linux-musl" --all-features --release
cargo build --package firecracker --package jailer --package seccompiler --package rebase-snap --package cpu-template-helper --target "$2-unknown-linux-musl" --all-features --release

# Stage binaries
mkdir -p out

dir="./build/cargo_target/$2-alpine-linux-musl/release"
dir="./build/cargo_target/$2-unknown-linux-musl/release"
for file in $(ls "$dir"); do
if [[ -x "$dir/$file" && ! -d "$dir/$file" ]]; then
cp "$dir/$file" "./out/${file}.linux-$2"
Expand Down

0 comments on commit 29497ec

Please sign in to comment.