diff --git a/.github/workflows/hydrun.yaml b/.github/workflows/hydrun.yaml index 2afecea26af..acbf89cdf81 100644 --- a/.github/workflows/hydrun.yaml +++ b/.github/workflows/hydrun.yaml @@ -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/* diff --git a/Hydrunfile b/Hydrunfile index 77e4832c543..83c65926b81 100755 --- a/Hydrunfile +++ b/Hydrunfile @@ -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"