mirror of
https://github.com/saymrwulf/cryptography.git
synced 2026-05-14 20:37:55 +00:00
Simplify CI scripts (#5582)
This commit is contained in:
parent
2b85c4d915
commit
21144be304
2 changed files with 3 additions and 6 deletions
8
.github/workflows/build_openssl.sh
vendored
8
.github/workflows/build_openssl.sh
vendored
|
|
@ -10,18 +10,16 @@ shlib_sed() {
|
|||
sed -i "s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=100.0.0/" Makefile
|
||||
}
|
||||
|
||||
# CONFIG_HASH is a global coming from a previous step
|
||||
OPENSSL_DIR="${GITHUB_WORKSPACE}/osslcache/${TYPE}-${VERSION}-${CONFIG_HASH}"
|
||||
if [[ "${TYPE}" == "openssl" ]]; then
|
||||
curl -O "https://www.openssl.org/source/openssl-${VERSION}.tar.gz"
|
||||
tar zxf "openssl-${VERSION}.tar.gz"
|
||||
pushd "openssl-${VERSION}"
|
||||
# CONFIG_FLAGS is a global coming from a previous step
|
||||
./config ${CONFIG_FLAGS} -fPIC --prefix="${OPENSSL_DIR}"
|
||||
./config ${CONFIG_FLAGS} -fPIC --prefix="${OSSL_PATH}"
|
||||
shlib_sed
|
||||
make depend
|
||||
make -j"$(nproc)"
|
||||
# avoid installing the docs on versions of OpenSSL that aren't ancient.
|
||||
# avoid installing the docs (for performance)
|
||||
# https://github.com/openssl/openssl/issues/6685#issuecomment-403838728
|
||||
make install_sw install_ssldirs
|
||||
popd
|
||||
|
|
@ -29,7 +27,7 @@ elif [[ "${TYPE}" == "libressl" ]]; then
|
|||
curl -O "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${VERSION}.tar.gz"
|
||||
tar zxf "libressl-${VERSION}.tar.gz"
|
||||
pushd "libressl-${VERSION}"
|
||||
./config -Wl -Wl,-Bsymbolic-functions -fPIC shared --prefix="${OPENSSL_DIR}"
|
||||
./config -Wl -Wl,-Bsymbolic-functions -fPIC shared --prefix="${OSSL_PATH}"
|
||||
shlib_sed
|
||||
make -j"$(nproc)" install
|
||||
popd
|
||||
|
|
|
|||
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
|
|
@ -64,7 +64,6 @@ jobs:
|
|||
env:
|
||||
TYPE: ${{ matrix.PYTHON.OPENSSL.TYPE }}
|
||||
VERSION: ${{ matrix.PYTHON.OPENSSL.VERSION }}
|
||||
GITHUB_WORKSPACE: ${{ github.workspace }}
|
||||
if: matrix.PYTHON.OPENSSL && steps.ossl-cache.outputs.cache-hit != 'true'
|
||||
- name: Set CFLAGS/LDFLAGS
|
||||
run: |
|
||||
|
|
|
|||
Loading…
Reference in a new issue