actions take 84

This commit is contained in:
Jay Lee
2020-12-04 15:53:19 -05:00
parent 693aeae9e5
commit 349cdbf582
2 changed files with 36 additions and 24 deletions

View File

@@ -40,6 +40,15 @@ jobs:
jid: 4 jid: 4
goal: "build" goal: "build"
gamos: "macos" gamos: "macos"
- os: windows-2019
jid: 5
goal: "build"
gamos: "windows"
- os: windows-2019
jid: 6
goal: "build"
gamos: "windows"
PLATFORM="x86"
- os: ubuntu-20.04 - os: ubuntu-20.04
goal: "test" goal: "test"
python: "3.6" python: "3.6"

View File

@@ -8,39 +8,42 @@ elif [[ "$PLATFORM" == "x86" ]]; then
export PYTHONFILE_BITS="" export PYTHONFILE_BITS=""
export OPENSSL_BITS="" export OPENSSL_BITS=""
export WIX_BITS="x86" export WIX_BITS="x86"
export $CHOCO_OPTIONS="--forcex86"
fi fi
echo "This is a ${BITS}-bit build for ${PLATFORM}" echo "This is a ${BITS}-bit build for ${PLATFORM}"
export mypath=$(pwd) export mypath=$(pwd)
cd ~ cd ~
choco install python $CHOCO_OPTIONS
# Python # Python
echo "Installing Python..." #echo "Installing Python..."
export python_file=python-${BUILD_PYTHON_VERSION}${PYTHONFILE_BITS}.exe #export python_file=python-${BUILD_PYTHON_VERSION}${PYTHONFILE_BITS}.exe
if [ ! -e $python_file ]; then #if [ ! -e $python_file ]; then
echo "Downloading $python_file..." # echo "Downloading $python_file..."
curl -O https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file # curl -O https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file
fi #fi
until ./${python_file} /quiet InstallAllUsers=1 TargetDir=c:\\python; do echo "trying python again..."; done #until ./${python_file} /quiet InstallAllUsers=1 TargetDir=c:\\python; do echo "trying python again..."; done
export python=/c/python/python.exe #export python=/c/python/python.exe
export pip=/c/python/scripts/pip.exe #export pip=/c/python/scripts/pip.exe
until [ -f $python ]; do sleep 1; done #until [ -f $python ]; do sleep 1; done
export PATH=$PATH:/c/python/scripts #export PATH=$PATH:/c/python/scripts
# OpenSSL # OpenSSL
echo "Installing OpenSSL..." #echo "Installing OpenSSL..."
export exefile=Win${BITS}OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe #export exefile=Win${BITS}OpenSSL_Light-${BUILD_OPENSSL_VERSION//./_}.exe
if [ ! -e $exefile ]; then #if [ ! -e $exefile ]; then
echo "Downloading $exefile..." # echo "Downloading $exefile..."
curl -O https://slproweb.com/download/$exefile # curl -O https://slproweb.com/download/$exefile
fi #fi
until ./${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl; do echo "trying openssl again..."; done #until ./${exefile} /silent /sp- /suppressmsgboxes /DIR=C:\\ssl; do echo "trying openssl again..."; done
until cp -v /c/ssl/libcrypto-1_1${OPENSSL_BITS}.dll /c/python/DLLs/; do echo "trying libcrypto copy again..."; sleep 3; done #until cp -v /c/ssl/libcrypto-1_1${OPENSSL_BITS}.dll /c/python/DLLs/; do echo "trying libcrypto copy again..."; sleep 3; done
until cp -v /c/ssl/libssl-1_1${OPENSSL_BITS}.dll /c/python/DLLs/; do echo "trying libssl copy again..."; done #until cp -v /c/ssl/libssl-1_1${OPENSSL_BITS}.dll /c/python/DLLs/; do echo "trying libssl copy again..."; done
if [[ "$PLATFORM" == "x86_64" ]]; then #if [[ "$PLATFORM" == "x86_64" ]]; then
cp -v /c/python/DLLs/libssl-1_1-x64.dll /c/python/DLLs/libssl-1_1.dll # cp -v /c/python/DLLs/libssl-1_1-x64.dll /c/python/DLLs/libssl-1_1.dll
cp -v /c/python/DLLs/libcrypto-1_1-x64.dll /c/python/DLLs/libcrypto-1_1.dll # cp -v /c/python/DLLs/libcrypto-1_1-x64.dll /c/python/DLLs/libcrypto-1_1.dll
fi #fi
cd $mypath cd $mypath