From 704fd3bea8e850664f5274842254cc5f55660b6d Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 25 Jan 2022 10:52:58 -0500 Subject: [PATCH] Update build.yml --- .github/workflows/build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4af9efe..eee6e939 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,6 +9,7 @@ on: defaults: run: shell: bash + path: src env: OPENSSL_CONFIG_OPTS: no-asm no-fips @@ -74,8 +75,8 @@ jobs: uses: actions/cache@v2 with: path: | - ./python - ./ssl + ../python + ../ssl key: ${{ matrix.jid }}-20220125 - name: Use pre-compiled Python for testing @@ -93,8 +94,8 @@ jobs: run: | export PYTHON=$(which python3) export PIP=$(which pip3) - export gam="${PYTHON} -m src.gam" - export gampath="$(readlink -e src/)" + export gam="${PYTHON} -m gam" + export gampath="$(readlink -e .)" echo -e "PYTHON: ${PYTHON}\nPIP: ${PIP}\gam: ${gam}\ngampath: ${gampath}" echo "PYTHON=${PYTHON}" >> $GITHUB_ENV echo "PIP=${PIP}" >> $GITHUB_ENV @@ -184,6 +185,7 @@ jobs: cd "${OPENSSL_SOURCE_PATH}" # --libdir=lib is needed so Python can find OpenSSL libraries "${PERL}" ./Configure "${OPENSSL_CONFIG_TARGET}" --libdir=lib --prefix="${OPENSSL_INSTALL_PATH}" $OPENSSL_CONFIG_OPTS + - name: Rename GNU link on Windows if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true' shell: bash @@ -325,7 +327,7 @@ jobs: run: | set +e "${PYTHON}" -m pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $PYTHON -m pip install -U --force-reinstall - "${PYTHON}" -m pip install --upgrade -r src/requirements.txt + "${PYTHON}" -m pip install --upgrade -r requirements.txt - name: Build GAM with PyInstaller if: matrix.goal != 'test'