Add libssl-dev in github workflow

thibmeu · Mar 11, 2023 · 7dfe90b · 7dfe90b
1 parent 3ff7048
commit 7dfe90b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 31 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,12 +20,13 @@ jobs:
         name: [linux, armv7, arm64, windows, macos]
         include:
           - name: linux
-            os: ubuntu-18.04
+            os: ubuntu-22.04
+            build_deps: >
             archive_name: dee.tar.gz
             asset_suffix: x86_64-linux.tar.gz
 
           - name: armv7
-            os: ubuntu-18.04
+            os: ubuntu-22.04
             target: armv7-unknown-linux-gnueabihf
             build_deps: >
               gcc-arm-linux-gnueabihf
@@ -37,7 +38,7 @@ jobs:
             asset_suffix: armv7-linux.tar.gz
 
           - name: arm64
-            os: ubuntu-18.04
+            os: ubuntu-22.04
             target: aarch64-unknown-linux-gnu
             build_deps: >
               gcc-aarch64-linux-gnu
@@ -111,20 +112,14 @@ jobs:
 
   deb:
     name: Debian ${{ matrix.name }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        name: [linux, linux-musl, armv7, armv7-musl, arm64, arm64-musl]
+        name: [linux, armv7, arm64]
         include:
           - name: linux
             target: x86_64-unknown-linux-gnu
 
-          - name: linux-musl
-            target: x86_64-unknown-linux-musl
-            build_deps: >
-              musl-tools
-            deb_flags: --variant=musl
-
           - name: armv7
             target: armv7-unknown-linux-gnueabihf
             build_deps: >
@@ -133,16 +128,6 @@ jobs:
               [target.armv7-unknown-linux-gnueabihf]
               linker = "arm-linux-gnueabihf-gcc"
 
-          - name: armv7-musl
-            target: armv7-unknown-linux-musleabihf
-            build_deps: >
-              gcc-arm-linux-gnueabihf
-              musl-tools
-            cargo_config: |
-              [target.armv7-unknown-linux-musleabihf]
-              linker = "arm-linux-gnueabihf-gcc"
-            deb_flags: --variant=musl
-
           - name: arm64
             target: aarch64-unknown-linux-gnu
             build_deps: >
@@ -151,16 +136,6 @@ jobs:
               [target.aarch64-unknown-linux-gnu]
               linker = "aarch64-linux-gnu-gcc"
 
-          - name: arm64-musl
-            target: aarch64-unknown-linux-musl
-            build_deps: >
-              gcc-aarch64-linux-gnu
-              musl-tools
-            cargo_config: |
-              [target.aarch64-unknown-linux-musl]
-              linker = "aarch64-linux-gnu-gcc"
-            deb_flags: --variant=musl
-
     steps:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/drand_core/Cargo.toml b/drand_core/Cargo.toml
@@ -18,6 +18,7 @@ anyhow = "1.0.69"
 async-trait = "0.1.66"
 bls12_381 = { version = "0.7.1", features = ["experimental"] }
 hex = { version = "0.4.3", features = ["serde"] }
+openssl = { version = "0.10.29", features = ["vendored"] } # required for cross compile
 pairing = "0.22.0"
 reqwest = { version = "0.11.14", features = [ "json" ] }
 serde = { version = "1.0.152", features = ["derive"] }