deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-04 12:51:36 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Use OpenSSL 3.0.0 in builds

Browse Source
This commit is contained in:
Jay Lee
2021-10-29 18:12:30 -04:00
parent 839768a2a5
commit 5436f21bc0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/linux-before-install.sh vendored
View File

@@ -55,7 +55,7 @@ else
tar xf openssl-$BUILD_OPENSSL_VERSION.tar.gz tar xf openssl-$BUILD_OPENSSL_VERSION.tar.gz
cd openssl-$BUILD_OPENSSL_VERSION cd openssl-$BUILD_OPENSSL_VERSION
echo "Compiling 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..." echo "Running make for OpenSSL..."
make -j$cpucount -s make -j$cpucount -s
echo "Running make install for OpenSSL..." echo "Running make install for OpenSSL..."
@@ -70,7 +70,7 @@ else
cd Python-$BUILD_PYTHON_VERSION cd Python-$BUILD_PYTHON_VERSION
echo "Compiling Python $BUILD_PYTHON_VERSION..." echo "Compiling Python $BUILD_PYTHON_VERSION..."
safe_flags="--with-openssl=$HOME/ssl --enable-shared --prefix=$HOME/python --with-ensurepip=upgrade" 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 if [ ! -e Makefile ]; then
echo "running configure with safe and unsafe" echo "running configure with safe and unsafe"
./configure $safe_flags $unsafe_flags > /dev/null ./configure $safe_flags $unsafe_flags > /dev/null

4
.github/workflows/build.yml vendored
View File

@@ -14,7 +14,7 @@ defaults:
env: env:
BUILD_PYTHON_VERSION: "3.10.0" BUILD_PYTHON_VERSION: "3.10.0"
MIN_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" MIN_OPENSSL_VERSION: "1.1.1l"
PATCHELF_VERSION: "0.13" PATCHELF_VERSION: "0.13"
# PYINSTALLER_VERSION can be full commit hash or version like v4.20 # PYINSTALLER_VERSION can be full commit hash or version like v4.20
@@ -92,7 +92,7 @@ jobs:
path: | path: |
~/python ~/python
~/ssl ~/ssl
key: ${{ matrix.os }}-${{ matrix.jid }}-20211029 key: ${{ matrix.os }}-${{ matrix.jid }}-20211030
- name: Set env variables - name: Set env variables
env: env: