Land #948

libressl · Nov 12, 2023 · daca1b4 · daca1b4
2 parents 63635ea + 291c0d9
commit daca1b4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/.github/rust-openssl.patch b/.github/rust-openssl.patch
diff --git a/.github/workflows/rust-openssl.yml b/.github/workflows/rust-openssl.yml
@@ -29,6 +29,14 @@ jobs:
       - name: "Run rust-openssl tests"
         run: |
           cd rust-openssl
-          patch -p1 < ../.github/rust-openssl.patch
+          # instead of erroring use the last supported version
+          ed -s openssl-sys/build/main.rs <<-EOF
+          /_ => version_error/-1
+          .t.
+          s/(.*=/_ =
+          +1d
+          w
+          q
+          EOF
           export OPENSSL_DIR=${HOME}/opt LD_LIBRARY_PATH=${HOME}/opt/lib
           cargo test --verbose