diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2022-12-05 06:50:02 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2023-01-19 17:16:33 +0000 |
| commit | d90907dfed17f7075ca48ab1e9a730eab6476e3b (patch) | |
| tree | e4df6faf8e0469db14f4d1602ef38a46e2f80c97 | |
| parent | d49c98d94d5251a7b257c2ef39e891f0a2dd52e6 (diff) | |
Fix CI failures with ubuntu-22.04
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19930)
| -rw-r--r-- | .github/workflows/cross-compiles.yml | 2 | ||||
| -rwxr-xr-x | test/recipes/95-test_external_pyca_data/cryptography.sh | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/.github/workflows/cross-compiles.yml b/.github/workflows/cross-compiles.yml index e5294c8ed1..1bd62da1b1 100644 --- a/.github/workflows/cross-compiles.yml +++ b/.github/workflows/cross-compiles.yml @@ -117,7 +117,7 @@ jobs: tests: none } ] - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: install packages run: | diff --git a/test/recipes/95-test_external_pyca_data/cryptography.sh b/test/recipes/95-test_external_pyca_data/cryptography.sh index 0af3e56c98..99720de4ba 100755 --- a/test/recipes/95-test_external_pyca_data/cryptography.sh +++ b/test/recipes/95-test_external_pyca_data/cryptography.sh @@ -42,19 +42,17 @@ python -m venv venv-cryptography cd pyca-cryptography -pip install .[test] -pip install -e vectors - echo "------------------------------------------------------------------" echo "Building cryptography" echo "------------------------------------------------------------------" -CFLAGS="-I$O_BINC -I$O_SINC -L$O_LIB" pip install . +LDFLAGS="-L$O_LIB" CFLAGS="-I$O_BINC -I$O_SINC" pip install .[test] +pip install -e vectors echo "------------------------------------------------------------------" echo "Running tests" echo "------------------------------------------------------------------" -CFLAGS="-I$O_BINC -I$O_SINC -L$O_LIB" pytest -n auto tests --wycheproof-root=../wycheproof +pytest -n auto tests --wycheproof-root=../wycheproof cd ../ deactivate |