diff --git a/.github/actions/linux-before-install.sh b/.github/actions/linux-before-install.sh index 396059ad..6e1ac2d0 100755 --- a/.github/actions/linux-before-install.sh +++ b/.github/actions/linux-before-install.sh @@ -55,7 +55,7 @@ else tar xf openssl-$BUILD_OPENSSL_VERSION.tar.gz cd openssl-$BUILD_OPENSSL_VERSION echo "Compiling OpenSSL $BUILD_OPENSSL_VERSION..." - ./config shared --prefix=$HOME/ssl + ./Configure --libdir=lib --prefix=$HOME/ssl echo "Running make for OpenSSL..." make -j$cpucount -s echo "Running make install for OpenSSL..." @@ -70,7 +70,7 @@ else cd Python-$BUILD_PYTHON_VERSION echo "Compiling Python $BUILD_PYTHON_VERSION..." safe_flags="--with-openssl=$HOME/ssl --enable-shared --prefix=$HOME/python --with-ensurepip=upgrade" - unsafe_flags="--enable-optimizations --with-lto" + unsafe_flags="--enable-optimizations --with-lto --with-openssl=~/ssl --with-openssl-rpath=~~/ssl/lib" if [ ! -e Makefile ]; then echo "running configure with safe and unsafe" ./configure $safe_flags $unsafe_flags > /dev/null diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d80ef9e..2cbec922 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ defaults: env: BUILD_PYTHON_VERSION: "3.10.0" MIN_PYTHON_VERSION: "3.10.0" - BUILD_OPENSSL_VERSION: "1.1.1l" + BUILD_OPENSSL_VERSION: "3.0.0" MIN_OPENSSL_VERSION: "1.1.1l" PATCHELF_VERSION: "0.13" # PYINSTALLER_VERSION can be full commit hash or version like v4.20 @@ -92,7 +92,7 @@ jobs: path: | ~/python ~/ssl - key: ${{ matrix.os }}-${{ matrix.jid }}-20211029 + key: ${{ matrix.os }}-${{ matrix.jid }}-20211030 - name: Set env variables env: