File tree Expand file tree Collapse file tree 2 files changed +13
-4
lines changed
Expand file tree Collapse file tree 2 files changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,10 @@ shlib_sed() {
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
1317if [[ " ${TYPE} " == " openssl" ]]; then
1418 if [[ " ${VERSION} " =~ ^[0-9a-f]{40}$ ]]; then
@@ -22,7 +26,12 @@ 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. ]] || [[ " ${VERSION} " =~ ^[0-9a-f]{40}$ ]]; then
30+ shlib_sed_3
31+ else
32+ # Used for < 3.0.0
33+ shlib_sed
34+ fi
2635 make depend
2736 make -j" $( nproc) "
2837 # avoid installing the docs (for performance)
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ concurrency:
1818
1919jobs :
2020 linux :
21- runs-on : ubuntu-20.04
21+ runs-on : ubuntu-latest
2222 strategy :
2323 fail-fast : false
2424 matrix :
6767 ~/.cargo/registry/src/
6868 ~/.cargo/git/db/
6969 src/rust/target/
70- key : ${{ runner.os }}-${{ matrix.PYTHON.VERSION }}-${{ steps.setup-python.outputs.python-version }}-cargo-3 -${{ hashFiles('**/Cargo.lock') }}
70+ key : ${{ runner.os }}-${{ matrix.PYTHON.VERSION }}-${{ steps.setup-python.outputs.python-version }}-cargo-4 -${{ hashFiles('**/Cargo.lock') }}
7171
72727373 timeout-minutes : 3
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
You can’t perform that action at this time.
0 commit comments