From 20b84928809633873c9003f72a6d1de0ec1fad85 Mon Sep 17 00:00:00 2001 From: jtnunley Date: Sat, 18 Mar 2023 08:57:11 -0700 Subject: [PATCH 1/6] Use unreleased android image --- Cross.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Cross.toml diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 0000000..2ca681f --- /dev/null +++ b/Cross.toml @@ -0,0 +1,3 @@ +[target.arm-linux-androideabi] +# Workaround https://github.com/cross-rs/cross/issues/1128 / https://github.com/rust-lang/rust/issues/103673 +image = "ghcr.io/cross-rs/arm-linux-androideabi:edge" \ No newline at end of file From 665432a47bcd8a8efb696b9721ecaa5e922141e2 Mon Sep 17 00:00:00 2001 From: jtnunley Date: Sat, 18 Mar 2023 10:34:25 -0700 Subject: [PATCH 2/6] Use latest cross --- .github/workflows/ci.yml | 5 +---- Cross.toml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 945bb75..0255905 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,10 +76,7 @@ jobs: - name: Install Rust run: rustup update stable - name: Install cross - uses: taiki-e/install-action@v2 - with: - # https://github.com/cross-rs/cross/issues/724 - tool: cross@0.2.1 + uses: taiki-e/install-action@cross - name: Android if: startsWith(matrix.os, 'ubuntu') run: cross test --target arm-linux-androideabi diff --git a/Cross.toml b/Cross.toml index 2ca681f..856f9b4 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,3 +1,3 @@ [target.arm-linux-androideabi] # Workaround https://github.com/cross-rs/cross/issues/1128 / https://github.com/rust-lang/rust/issues/103673 -image = "ghcr.io/cross-rs/arm-linux-androideabi:edge" \ No newline at end of file +image = "ghcr.io/cross-rs/arm-linux-androideabi:edge" From f096b75f79d7115ea47ace6c7804557b3657ad0d Mon Sep 17 00:00:00 2001 From: jtnunley Date: Mon, 20 Mar 2023 23:33:25 -0700 Subject: [PATCH 3/6] Rustup add target in CI --- .github/workflows/ci.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0255905..740b2fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,12 +80,22 @@ jobs: - name: Android if: startsWith(matrix.os, 'ubuntu') run: cross test --target arm-linux-androideabi + - name: NetBSD + if: startsWith(matrix.os, 'ubuntu') + run: cross build --target x86_64-unknown-netbsd + - name: FreeBSD + if: startsWith(matrix.os, 'ubuntu') + run: cross build --target x86_64-unknown-freebsd - name: iOS if: startsWith(matrix.os, 'macos') - run: cross build --target aarch64-apple-ios + run: | + rustup target add aarch64-apple-ios + cross build --target aarch64-apple-ios - name: Linux x32 if: startsWith(matrix.os, 'ubuntu') - run: cross check --target x86_64-unknown-linux-gnux32 + run: | + rustup target add x86_64-unknown-linux-gnux32 + cross check --target x86_64-unknown-linux-gnux32 - name: Fuchsia if: startsWith(matrix.os, 'ubuntu') run: | From 98d31fdfd140da638c9592670d296cd2149bbc6b Mon Sep 17 00:00:00 2001 From: jtnunley Date: Mon, 20 Mar 2023 23:37:54 -0700 Subject: [PATCH 4/6] Do the BSDs need it too? --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 740b2fb..0f64c2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,10 +82,14 @@ jobs: run: cross test --target arm-linux-androideabi - name: NetBSD if: startsWith(matrix.os, 'ubuntu') - run: cross build --target x86_64-unknown-netbsd + run: | + rustup target add x86_64-unknown-netbsd + cross build --target x86_64-unknown-netbsd - name: FreeBSD if: startsWith(matrix.os, 'ubuntu') - run: cross build --target x86_64-unknown-freebsd + run: | + rustup target add x86_64-unknown-freebsd + cross build --target x86_64-unknown-freebsd - name: iOS if: startsWith(matrix.os, 'macos') run: | From 58adff4e1daa754983095fa11745251359985884 Mon Sep 17 00:00:00 2001 From: jtnunley Date: Tue, 21 Mar 2023 00:36:52 -0700 Subject: [PATCH 5/6] Remove BSD cross tests --- .github/workflows/ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f64c2d..6de73a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,16 +80,6 @@ jobs: - name: Android if: startsWith(matrix.os, 'ubuntu') run: cross test --target arm-linux-androideabi - - name: NetBSD - if: startsWith(matrix.os, 'ubuntu') - run: | - rustup target add x86_64-unknown-netbsd - cross build --target x86_64-unknown-netbsd - - name: FreeBSD - if: startsWith(matrix.os, 'ubuntu') - run: | - rustup target add x86_64-unknown-freebsd - cross build --target x86_64-unknown-freebsd - name: iOS if: startsWith(matrix.os, 'macos') run: | From 99e514ce568518214880d2285f71d2a25e9095f3 Mon Sep 17 00:00:00 2001 From: jtnunley Date: Wed, 22 Mar 2023 09:57:14 -0700 Subject: [PATCH 6/6] Add BSD comment + fix fuchsia --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6de73a4..aef696b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,6 +77,7 @@ jobs: run: rustup update stable - name: Install cross uses: taiki-e/install-action@cross + # We don't test BSDs, since we already test them in Cirrus/vmactions. - name: Android if: startsWith(matrix.os, 'ubuntu') run: cross test --target arm-linux-androideabi @@ -93,8 +94,8 @@ jobs: - name: Fuchsia if: startsWith(matrix.os, 'ubuntu') run: | - rustup target add x86_64-fuchsia - cargo build --target x86_64-fuchsia + rustup target add x86_64-unknown-fuchsia + cargo build --target x86_64-unknown-fuchsia - name: illumos if: startsWith(matrix.os, 'ubuntu') run: |