From dd9ea2191dfcbd5ff0cdb86cbc1f96e64835f9d3 Mon Sep 17 00:00:00 2001 From: Bas Zalmstra Date: Mon, 4 Dec 2023 15:42:22 +0100 Subject: [PATCH] feat: enable powerpc and s390x (#425) With the release of `ring v0.17` we should now be able to target a lot more targets. Lets try! --- .github/workflows/release-python.yml | 18 ++++++++---------- .github/workflows/rust-compile.yml | 14 +++++++------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml index 5b2eb3b0b..34f704e80 100644 --- a/.github/workflows/release-python.yml +++ b/.github/workflows/release-python.yml @@ -69,9 +69,8 @@ jobs: arch: x64 - target: i686-pc-windows-msvc arch: x86 - # ring 0.16.20 doesnt support this platform yet - # - target: aarch64-pc-windows-msvc - # arch: x64 + - target: aarch64-pc-windows-msvc + arch: x64 steps: - uses: actions/checkout@v4 with: @@ -152,13 +151,12 @@ jobs: arch: aarch64 - target: armv7-unknown-linux-gnueabihf arch: armv7 - # ring 0.16.20 doesnt support these platforms yet - # - target: s390x-unknown-linux-gnu - # arch: s390x - # - target: powerpc64le-unknown-linux-gnu - # arch: ppc64le - # - target: powerpc64-unknown-linux-gnu - # arch: ppc64 + - target: s390x-unknown-linux-gnu + arch: s390x + - target: powerpc64le-unknown-linux-gnu + arch: ppc64le + - target: powerpc64-unknown-linux-gnu + arch: ppc64 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/rust-compile.yml b/.github/workflows/rust-compile.yml index 617c2752b..4394dac40 100644 --- a/.github/workflows/rust-compile.yml +++ b/.github/workflows/rust-compile.yml @@ -63,24 +63,24 @@ jobs: include: - { name: "Linux-x86_64", target: x86_64-unknown-linux-musl, os: ubuntu-latest } - { name: "Linux-aarch64", target: aarch64-unknown-linux-musl, os: ubuntu-latest, skip-tests: true } - # - { name: "Linux-arm", target: arm-unknown-linux-musleabi, os: ubuntu-latest, use-cross: true } + - { name: "Linux-arm", target: arm-unknown-linux-musleabi, os: ubuntu-latest, use-cross: true, skip-tests: true } # - { name: "Linux-mips", target: mips-unknown-linux-musl, os: ubuntu-latest, use-cross: true, skip-tests: true } # - { name: "Linux-mipsel", target: mipsel-unknown-linux-musl, os: ubuntu-latest, use-cross: true, skip-tests: true } # - { name: "Linux-mips64", target: mips64-unknown-linux-muslabi64, os: ubuntu-latest, use-cross: true, skip-tests: true } # - { name: "Linux-mips64el", target: mips64el-unknown-linux-muslabi64, os: ubuntu-latest, use-cross: true, skip-tests: true } - # - { name: "Linux-powerpc", target: powerpc-unknown-linux-gnu, os: ubuntu-latest, use-cross: true, skip-tests: true } - # - { name: "Linux-powerpc64", target: powerpc64-unknown-linux-gnu, os: ubuntu-latest, use-cross: true, skip-tests: true } - # - { name: "Linux-powerpc64le", target: powerpc-unknown-linux-gnu, os: ubuntu-latest, use-cross: true, skip-tests: true } +# - { name: "Linux-powerpc", target: powerpc-unknown-linux-gnu, os: ubuntu-latest, use-cross: true, skip-tests: true } + - { name: "Linux-powerpc64", target: powerpc64-unknown-linux-gnu, os: ubuntu-latest, use-cross: true, skip-tests: true } + - { name: "Linux-powerpc64le", target: powerpc64le-unknown-linux-gnu, os: ubuntu-latest, use-cross: true, skip-tests: true } - # - { name: "Linux-s390x", target: s390x-unknown-linux-gnu, os: ubuntu-latest, use-cross: true, skip-tests: true } + - { name: "Linux-s390x", target: s390x-unknown-linux-gnu, os: ubuntu-latest, use-cross: true, skip-tests: true } - { name: "macOS-x86_64", target: x86_64-apple-darwin, os: macOS-latest } - { name: "macOS-aarch64", target: aarch64-apple-darwin, os: macOS-latest, skip-tests: true } - { name: "Windows-x86_64", target: x86_64-pc-windows-msvc, os: windows-latest } - # - { name: "Windows-aarch64", target: aarch64-pc-windows-msvc, os: windows-latest, skip-tests: true } + - { name: "Windows-aarch64", target: aarch64-pc-windows-msvc, os: windows-latest, skip-tests: true } steps: - name: Checkout source code uses: actions/checkout@v4 @@ -112,7 +112,7 @@ jobs: - name: Use rustls on musl targets. id: build-options - if: contains(matrix.target, '-musl') + if: contains(matrix.target, '-musl') || startsWith(matrix.target, 'powerpc') || startsWith(matrix.target, 's390x') run: | echo "CARGO_BUILD_OPTIONS=${CARGO_BUILD_OPTIONS} --no-default-features --features rustls-tls" >> $GITHUB_OUTPUT