Skip to content

Commit b167f32

Browse files
committed
fix CI to work with ubuntu 22.04
1 parent 8867724 commit b167f32

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

.github/workflows/build_openssl.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
set -e
33
set -x
44

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

1317
if [[ "${TYPE}" == "openssl" ]]; then
1418
if [[ "${VERSION}" =~ ^[0-9a-f]{40}$ ]]; then
@@ -22,7 +26,11 @@ if [[ "${TYPE}" == "openssl" ]]; then
2226
fi
2327
# CONFIG_FLAGS is a global coming from a previous step
2428
./config ${CONFIG_FLAGS} -fPIC --prefix="${OSSL_PATH}"
25-
shlib_sed
29+
if [[ "${VERSION}" =~ ^3. ]]; then
30+
shlib_sed_3
31+
else
32+
shlib_sed_111
33+
fi
2634
make depend
2735
make -j"$(nproc)"
2836
# avoid installing the docs (for performance)

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818

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

0 commit comments

Comments
 (0)