fixup! fixup! fixup! fixup! fixup! Support cryptography module

Tongsuo-Project · Jul 23, 2024 · 23f5f0b · 23f5f0b
1 parent cea0ad6
commit 23f5f0b
Showing 1 changed file with 28 additions and 5 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -32,11 +32,10 @@ jobs:
     - name: Run tests
       run: cargo test --verbose
 
-  unix-tongsuo-test:
+  macos-tongsuo-test:
     strategy:
       matrix:
         os:
-          - ubuntu-latest
           - macos-latest
     runs-on: ${{matrix.os}}
 
@@ -56,9 +55,33 @@ jobs:
         OPENSSL_DIR=${RUNNER_TEMP}/tongsuo DEP_OPENSSL_TONGSUO=1 cargo build --verbose --features crypto_adaptor_tongsuo --no-default-features --config 'patch.crates-io.openssl.git="https://github.com/Tongsuo-Project/rust-tongsuo.git"' --config 'patch.crates-io.openssl-sys.git="https://github.com/Tongsuo-Project/rust-tongsuo.git"'
     - name: Run tests
       run : |
-        export DEP_OPENSSL_TONGSUO=1
-        export OPENSSL_DIR=${RUNNER_TEMP}/tongsuo
-        cargo test --verbose --features crypto_adaptor_tongsuo --no-default-features --config 'patch.crates-io.openssl.git="https://github.com/Tongsuo-Project/rust-tongsuo.git"' --config 'patch.crates-io.openssl-sys.git="https://github.com/Tongsuo-Project/rust-tongsuo.git"'
+        OPENSSL_DIR=${RUNNER_TEMP}/tongsuo DEP_OPENSSL_TONGSUO=1 cargo test --verbose --features crypto_adaptor_tongsuo --no-default-features --config 'patch.crates-io.openssl.git="https://github.com/Tongsuo-Project/rust-tongsuo.git"' --config 'patch.crates-io.openssl-sys.git="https://github.com/Tongsuo-Project/rust-tongsuo.git"'
+
+  unix-tongsuo-test:
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+    runs-on: ${{matrix.os}}
+
+    steps:
+    - name: Build Tongsuo
+      run: |
+        wget "https://github.com/Tongsuo-Project/Tongsuo/archive/refs/tags/${TONGSUO_VERSION}.tar.gz"
+        tar zxf "${TONGSUO_VERSION}.tar.gz"
+        pushd "Tongsuo-${TONGSUO_VERSION}"
+        ./config --prefix=${RUNNER_TEMP}/tongsuo --libdir=${RUNNER_TEMP}/tongsuo/lib
+        make -j4
+        make install
+        popd
+    - uses: actions/checkout@v3
+    - name: Build
+      run : |
+        OPENSSL_DIR=${RUNNER_TEMP}/tongsuo DEP_OPENSSL_TONGSUO=1 cargo build --verbose --features crypto_adaptor_tongsuo --no-default-features --config 'patch.crates-io.openssl.git="https://github.com/Tongsuo-Project/rust-tongsuo.git"' --config 'patch.crates-io.openssl-sys.git="https://github.com/Tongsuo-Project/rust-tongsuo.git"'
+    - name: Run tests
+      run : |
+        OPENSSL_DIR=${RUNNER_TEMP}/tongsuo DEP_OPENSSL_TONGSUO=1 RUSTFLAGS="-C link-args=-Wl,-rpath,${RUNNER_TEMP}/tongsuo/lib" cargo test --verbose --features crypto_adaptor_tongsuo --no-default-features --config 'patch.crates-io.openssl.git="https://github.com/Tongsuo-Project/rust-tongsuo.git"' --config 'patch.crates-io.openssl-sys.git="https://github.com/Tongsuo-Project/rust-tongsuo.git"'
+
 
   unix-mysql-test:
     strategy: