Fix manylinux and musllinux CI builds

trailofbits · Oct 16, 2024 · 35a79bb · 35a79bb
1 parent 8d88010
commit 35a79bb
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 30 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -20,59 +20,56 @@ permissions:
 
 jobs:
   linux:
-    runs-on: ${{ matrix.platform.runner }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         platform:
-          - runner: ubuntu-latest
-            target: x86_64
-          - runner: ubuntu-latest
-            target: x86
-          - runner: ubuntu-latest
-            target: aarch64
-          - runner: ubuntu-latest
-            target: armv7
-          - runner: ubuntu-latest
-            target: s390x
-          - runner: ubuntu-latest
-            target: ppc64le
+          - target: x86_64
+          - target: x86
+          - target: aarch64
+          - target: armv7
+          # - target: s390x
+          # - target: ppc64le
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x
-
-      - name: Install openssl
-        run: |
-          sudo apt-get update
-          sudo apt-get install --yes --no-install-recommends libssl-dev
-
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
           args: --release --out dist --find-interpreter
           sccache: 'true'
           manylinux: auto
+          before-script-linux: |
+            if command -v yum 2>&1 >/dev/null
+            then
+              yum update
+              yum install -y perl-core cpanminus
+              # Workaround for OpenSSL not building on Centos 7 (manylinux2014)
+              # Remove once `openssl-src` builds OpenSSL > 3.3.2 by default
+              # Ref: https://github.com/openssl/openssl/pull/25367#issuecomment-2327177830
+              cpanm --verbose --notest install Sub::Util
+            # else
+            #   apt update
+            #   apt install -y perl-core
+            fi
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
           name: wheels-linux-${{ matrix.platform.target }}
           path: dist
 
   musllinux:
-    runs-on: ${{ matrix.platform.runner }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         platform:
-          - runner: ubuntu-latest
-            target: x86_64
-          - runner: ubuntu-latest
-            target: x86
-          - runner: ubuntu-latest
-            target: aarch64
-          - runner: ubuntu-latest
-            target: armv7
+          - target: x86_64
+          - target: x86
+          - target: aarch64
+          - target: armv7
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5

diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -21,7 +21,7 @@ hex = "0.4"
 sha2 = "0.10.8"
 rand = "0.8.5"
 cryptography-x509 = { git = "https://github.com/pyca/cryptography.git"}
-openssl = "0.10.66"
+openssl = { version = "0.10.66", features = ["vendored"] }
 
 [features]
-extension-module = ["pyo3/extension-module"]
+extension-module = ["pyo3/extension-module"]