diff options
| author | Theo Buehler <tb@openbsd.org> | 2023-11-12 00:02:17 +0100 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2024-03-03 09:16:20 -0600 |
| commit | 382026149103f26196481c87f8e789af7d34892d (patch) | |
| tree | f1403e0591e6bf5ef431dc35d461186fde30e8a5 /.github/workflows | |
| parent | 3740b7bdc9b1319eca827daef79cbe52fa87a544 (diff) | |
| download | portable-382026149103f26196481c87f8e789af7d34892d.tar.gz portable-382026149103f26196481c87f8e789af7d34892d.tar.bz2 portable-382026149103f26196481c87f8e789af7d34892d.zip | |
Replace rust-openssl patch with an ed script
It is annoying to update this patch all the time. An easy ed script
does the trick just as well.
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/rust-openssl.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.github/workflows/rust-openssl.yml b/.github/workflows/rust-openssl.yml index cec2de0..ef5a7b1 100644 --- a/.github/workflows/rust-openssl.yml +++ b/.github/workflows/rust-openssl.yml | |||
| @@ -29,6 +29,14 @@ jobs: | |||
| 29 | - name: "Run rust-openssl tests" | 29 | - name: "Run rust-openssl tests" |
| 30 | run: | | 30 | run: | |
| 31 | cd rust-openssl | 31 | cd rust-openssl |
| 32 | patch -p1 < ../.github/rust-openssl.patch | 32 | # instead of erroring use the last supported version |
| 33 | ed -s openssl-sys/build/main.rs <<-EOF | ||
| 34 | /_ => version_error/-1 | ||
| 35 | .t. | ||
| 36 | s/(.*=/_ = | ||
| 37 | +1d | ||
| 38 | w | ||
| 39 | q | ||
| 40 | EOF | ||
| 33 | export OPENSSL_DIR=${HOME}/opt LD_LIBRARY_PATH=${HOME}/opt/lib | 41 | export OPENSSL_DIR=${HOME}/opt LD_LIBRARY_PATH=${HOME}/opt/lib |
| 34 | cargo test --verbose | 42 | cargo test --verbose |