Skip to content

Commit

Permalink
Replace rust-openssl patch with an ed script
Browse files Browse the repository at this point in the history
It is annoying to update this patch all the time. An easy ed script
does the trick just as well.
  • Loading branch information
botovq committed Nov 11, 2023
1 parent 63635ea commit 291c0d9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
12 changes: 0 additions & 12 deletions .github/rust-openssl.patch

This file was deleted.

10 changes: 9 additions & 1 deletion .github/workflows/rust-openssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 291c0d9

Please sign in to comment.