Skip to content

Commit

Permalink
fix CI to work with ubuntu 22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
reaperhulk committed Dec 31, 2022
1 parent 8867724 commit b167f32
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/build_openssl.sh
Expand Up @@ -2,13 +2,17 @@
set -e
set -x

shlib_sed() {
shlib_sed_111() {
# modify the shlib version to a unique one to make sure the dynamic
# linker doesn't load the system one.
sed -i "s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=100/" Makefile
sed -i "s/^SHLIB_MINOR=.*/SHLIB_MINOR=0.0/" Makefile
sed -i "s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=100.0.0/" Makefile
}
shlib_sed_3() {
# OpenSSL 3 changes how it does the shlib versioning
sed -i "s/^SHLIB_VERSION=.*/SHLIB_VERSION=100/" VERSION.dat
}

if [[ "${TYPE}" == "openssl" ]]; then
if [[ "${VERSION}" =~ ^[0-9a-f]{40}$ ]]; then
Expand All @@ -22,7 +26,11 @@ if [[ "${TYPE}" == "openssl" ]]; then
fi
# CONFIG_FLAGS is a global coming from a previous step
./config ${CONFIG_FLAGS} -fPIC --prefix="${OSSL_PATH}"
shlib_sed
if [[ "${VERSION}" =~ ^3. ]]; then
shlib_sed_3
else
shlib_sed_111
fi
make depend
make -j"$(nproc)"
# avoid installing the docs (for performance)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -18,7 +18,7 @@ concurrency:

jobs:
linux:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
path: ${{ github.workspace }}/osslcache
# When altering the openssl build process you may need to increment the value on the end of this cache key
# so that you can prevent it from fetching the cache and skipping the build step.
key: ${{ matrix.PYTHON.OPENSSL.TYPE }}-${{ matrix.PYTHON.OPENSSL.VERSION }}-${{ env.CONFIG_HASH }}-2
key: ${{ matrix.PYTHON.OPENSSL.TYPE }}-${{ matrix.PYTHON.OPENSSL.VERSION }}-${{ env.CONFIG_HASH }}-3
if: matrix.PYTHON.OPENSSL
- name: Build custom OpenSSL/LibreSSL
run: .github/workflows/build_openssl.sh
Expand Down

0 comments on commit b167f32

Please sign in to comment.