From 21144be3049bfe567eed0f2e59027fe5d5489ca5 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sat, 21 Nov 2020 20:38:08 -0500
Subject: [PATCH] Simplify CI scripts (#5582)

---
 .github/workflows/build_openssl.sh | 8 +++-----
 .github/workflows/ci.yml           | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_openssl.sh b/.github/workflows/build_openssl.sh
index d5f23f61a..99c3f4d33 100755
--- a/.github/workflows/build_openssl.sh
+++ b/.github/workflows/build_openssl.sh
@@ -10,18 +10,16 @@ shlib_sed() {
   sed -i "s/^SHLIB_VERSION_NUMBER=.*/SHLIB_VERSION_NUMBER=100.0.0/" Makefile
 }
 
-# CONFIG_HASH is a global coming from a previous step
-OPENSSL_DIR="${GITHUB_WORKSPACE}/osslcache/${TYPE}-${VERSION}-${CONFIG_HASH}"
 if [[ "${TYPE}" == "openssl" ]]; then
   curl -O "https://www.openssl.org/source/openssl-${VERSION}.tar.gz"
   tar zxf "openssl-${VERSION}.tar.gz"
   pushd "openssl-${VERSION}"
   # CONFIG_FLAGS is a global coming from a previous step
-  ./config ${CONFIG_FLAGS} -fPIC --prefix="${OPENSSL_DIR}"
+  ./config ${CONFIG_FLAGS} -fPIC --prefix="${OSSL_PATH}"
   shlib_sed
   make depend
   make -j"$(nproc)"
-  # avoid installing the docs on versions of OpenSSL that aren't ancient.
+  # avoid installing the docs (for performance)
   # https://github.com/openssl/openssl/issues/6685#issuecomment-403838728
   make install_sw install_ssldirs
   popd
@@ -29,7 +27,7 @@ elif [[ "${TYPE}" == "libressl" ]]; then
   curl -O "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${VERSION}.tar.gz"
   tar zxf "libressl-${VERSION}.tar.gz"
   pushd "libressl-${VERSION}"
-  ./config -Wl -Wl,-Bsymbolic-functions -fPIC shared --prefix="${OPENSSL_DIR}"
+  ./config -Wl -Wl,-Bsymbolic-functions -fPIC shared --prefix="${OSSL_PATH}"
   shlib_sed
   make -j"$(nproc)" install
   popd
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c2ed8087..2cd2d9c01 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,7 +64,6 @@ jobs:
         env:
           TYPE: ${{ matrix.PYTHON.OPENSSL.TYPE }}
           VERSION: ${{ matrix.PYTHON.OPENSSL.VERSION }}
-          GITHUB_WORKSPACE: ${{ github.workspace }}
         if: matrix.PYTHON.OPENSSL && steps.ossl-cache.outputs.cache-hit != 'true'
       - name: Set CFLAGS/LDFLAGS
         run: |