Try to fix build errors

This commit is contained in:
Ross Scroggs
2023-10-20 16:42:06 -07:00
parent 4934809b88
commit bcf9c051f0

View File

@ -114,7 +114,7 @@ jobs:
path: | path: |
bin.tar.xz bin.tar.xz
src/cpython src/cpython
key: gam-${{ matrix.jid }}-20230626 key: gam-${{ matrix.jid }}-20231020
- name: Untar Cache archive - name: Untar Cache archive
if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true'
@ -343,11 +343,11 @@ jobs:
git clone https://github.com/python/cpython.git git clone https://github.com/python/cpython.git
cd "${PYTHON_SOURCE_PATH}" cd "${PYTHON_SOURCE_PATH}"
# Pin Windows to 3.11.6 for the moment # Pin Windows to 3.11.6 for the moment
if [[ "${RUNNER_OS}" == "Windows" ]]; then # if [[ "${RUNNER_OS}" == "Windows" ]]; then
export LATEST_STABLE_TAG="v3.11.6" # export LATEST_STABLE_TAG="v3.11.6"
else # else
export LATEST_STABLE_TAG=$(git tag --list | grep -v a | grep -v rc | grep -v b | sort -Vr | head -n1) export LATEST_STABLE_TAG=$(git tag --list | grep -v a | grep -v rc | grep -v b | sort -Vr | head -n1)
fi # fi
git checkout "${LATEST_STABLE_TAG}" git checkout "${LATEST_STABLE_TAG}"
export COMPILED_PYTHON_VERSION=${LATEST_STABLE_TAG:1} # Trim the "v" prefix export COMPILED_PYTHON_VERSION=${LATEST_STABLE_TAG:1} # Trim the "v" prefix
echo "COMPILED_PYTHON_VERSION=${COMPILED_PYTHON_VERSION}" >> $GITHUB_ENV echo "COMPILED_PYTHON_VERSION=${COMPILED_PYTHON_VERSION}" >> $GITHUB_ENV
@ -487,6 +487,8 @@ jobs:
#V6.0.0 causes errors on staticx #V6.0.0 causes errors on staticx
if [[ "${staticx}" == "yes" ]]; then if [[ "${staticx}" == "yes" ]]; then
git checkout "v5.13.2" git checkout "v5.13.2"
elif [[ "${RUNNER_OS}" == "Windows" ]]; then
git checkout "v5.13.2"
else else
git checkout "${latest_release}" git checkout "${latest_release}"
fi fi