From e310b99763ebc5e53bf942c64b00e8b1cc793b12 Mon Sep 17 00:00:00 2001 From: Justin Smith Date: Mon, 6 May 2024 11:37:15 -0400 Subject: [PATCH 1/2] CI for cross-compiling to x86_64-pc-windows-gnu --- .github/workflows/cross.yml | 1 + Cross.toml | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml index 97d8e3ad988..668724dc28c 100644 --- a/.github/workflows/cross.yml +++ b/.github/workflows/cross.yml @@ -41,6 +41,7 @@ jobs: - x86_64-unknown-linux-musl - aarch64-unknown-linux-musl - s390x-unknown-linux-gnu + - x86_64-pc-windows-gnu steps: - uses: actions/checkout@v3 with: diff --git a/Cross.toml b/Cross.toml index 43571707984..bfbfc256e3e 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,6 +1,14 @@ [build] dockerfile = "./docker/linux-cross/Dockerfile" +[target.x86_64-pc-windows-gnu] +pre-build = [ + "apt-get update && apt-get install --assume-yes nasm clang wget", + "mkdir -pm755 /etc/apt/keyrings", + "wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/winehq-jammy.sources", + "apt install --assume-yes --install-recommends winehq-stable" +] + [build.env] passthrough = [ "AWS_LC_SYS_NO_PREFIX", "AWS_LC_FIPS_SYS_NO_PREFIX", From 5827cd5526f117c48ce49f0485378dd781ee99ce Mon Sep 17 00:00:00 2001 From: Justin Smith Date: Mon, 6 May 2024 11:39:13 -0400 Subject: [PATCH 2/2] Stick with ubuntu-22.04 for now --- .github/workflows/cross.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml index 668724dc28c..80481e23afc 100644 --- a/.github/workflows/cross.yml +++ b/.github/workflows/cross.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest ] + os: [ ubuntu-22.04 ] target: - arm-unknown-linux-gnueabihf - aarch64-unknown-linux-gnu