From c7781e66e1ede4c9880bec67ba58fd38c42677bc Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Thu, 6 Oct 2022 22:18:30 -0400 Subject: [PATCH 01/37] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cfd8c464..67873685 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,7 @@ jobs: with: path: | bin.tar.xz - key: gam-${{ matrix.jid }}-20221006 + key: gam-${{ matrix.jid }}-20221006-01 - name: Untar Cache archive if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' From 2037189148cf0e66d77c66202cffaf87e6fef78c Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 7 Oct 2022 08:13:43 -0400 Subject: [PATCH 02/37] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 67873685..b82a3eed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: goal: build arch: x86_64 openssl_archs: linux-x86_64 - - os: [self-hosted, linux, arm64] + - os: [self-hosted, linux, arm64, gcp] jid: 2 goal: build arch: aarch64 From 7e36e5abe65e78fa5a92bfd3e29ab806842c71e7 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 7 Oct 2022 10:23:26 -0400 Subject: [PATCH 03/37] Update build.yml --- .github/workflows/build.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b82a3eed..5507ae27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -200,7 +200,6 @@ jobs: echo "PYBUILDRELEASE_ARCH=${PYBUILDRELEASE_ARCH}" >> $GITHUB_ENV echo "openssl_archs=${openssl_archs}" >> $GITHUB_ENV echo "LD_LIBRARY_PATH=${OPENSSL_INSTALL_PATH}/lib:${PYTHON_INSTALL_PATH}/lib" >> $GITHUB_ENV - #echo "PATH=${PATH}:${PYTHON_INSTALL_PATH}/scripts" >> $GITHUB_ENV - name: Get latest stable OpenSSL source if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true' @@ -282,6 +281,9 @@ jobs: cd "${GITHUB_WORKSPACE}/src/openssl-${openssl_archs}" # install_sw saves us ages processing man pages :-) $MAKE install_sw + export PATH="${OPENSSL_INSTALL_PATH}/bin:${PATH}" + echo "PATH=${PATH}" >> $GITHUB_ENV + echo "PATH: ${PATH}" fi - name: Run OpenSSL @@ -373,6 +375,9 @@ jobs: Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\Lib\*" "${env:PYTHON_INSTALL_PATH}\lib\" -recurse Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\Include\*" "${env:PYTHON_INSTALL_PATH}\include\" -recurse Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\PC\*.h" "${env:PYTHON_INSTALL_PATH}\include\" + export PATH="${PYTHON_INSTALL_PATH}/bin:${PATH}" + echo "PATH=${PATH}" >> $GITHUB_ENV + echo "PATH: ${PATH}" - name: Mac/Linux Build Python if: matrix.goal == 'build' && runner.os != 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true' @@ -387,6 +392,9 @@ jobs: cd "${PYTHON_SOURCE_PATH}" $MAKE altinstall $MAKE bininstall + export PATH="${PYTHON_INSTALL_PATH}/bin:${PATH}" + echo "PATH=${PATH}" >> $GITHUB_ENV + echo "PATH: ${PATH}" - name: Run Python run: | From 4085816fa32da54e41ac88a1a1c6930330805489 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 7 Oct 2022 10:52:12 -0400 Subject: [PATCH 04/37] Update build.yml --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5507ae27..e587d49a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -281,9 +281,6 @@ jobs: cd "${GITHUB_WORKSPACE}/src/openssl-${openssl_archs}" # install_sw saves us ages processing man pages :-) $MAKE install_sw - export PATH="${OPENSSL_INSTALL_PATH}/bin:${PATH}" - echo "PATH=${PATH}" >> $GITHUB_ENV - echo "PATH: ${PATH}" fi - name: Run OpenSSL From 26925c30c1656f67283a9d988e442473c77b4c8d Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 7 Oct 2022 11:40:59 -0400 Subject: [PATCH 05/37] Update build.yml --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e587d49a..436c0000 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -372,9 +372,9 @@ jobs: Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\Lib\*" "${env:PYTHON_INSTALL_PATH}\lib\" -recurse Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\Include\*" "${env:PYTHON_INSTALL_PATH}\include\" -recurse Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\PC\*.h" "${env:PYTHON_INSTALL_PATH}\include\" - export PATH="${PYTHON_INSTALL_PATH}/bin:${PATH}" - echo "PATH=${PATH}" >> $GITHUB_ENV - echo "PATH: ${PATH}" + $env:Path = '${PYTHON_INSTALL_PATH}/bin' + $env:Path + echo "Path=$env:Path" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + echo "PATH: ${env:Path}" - name: Mac/Linux Build Python if: matrix.goal == 'build' && runner.os != 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true' @@ -389,7 +389,7 @@ jobs: cd "${PYTHON_SOURCE_PATH}" $MAKE altinstall $MAKE bininstall - export PATH="${PYTHON_INSTALL_PATH}/bin:${PATH}" + export PATH="${PATH}:${PYTHON_INSTALL_PATH}/bin" echo "PATH=${PATH}" >> $GITHUB_ENV echo "PATH: ${PATH}" From b12fda500762216a40b17a120f6ef9656f27e15c Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 11 Oct 2022 17:15:03 -0400 Subject: [PATCH 06/37] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 436c0000..d3c99084 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,7 @@ jobs: with: path: | bin.tar.xz - key: gam-${{ matrix.jid }}-20221006-01 + key: gam-${{ matrix.jid }}-20221011 - name: Untar Cache archive if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' From 3ef8a5a7625b8b6d7c3bbdefb4e113a00fed1564 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 12 Oct 2022 08:10:38 -0400 Subject: [PATCH 07/37] Update var.py --- src/gam/var.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gam/var.py b/src/gam/var.py index cd9c1fc1..106e749f 100644 --- a/src/gam/var.py +++ b/src/gam/var.py @@ -8,7 +8,7 @@ import platform import re GAM_AUTHOR = 'Jay Lee ' -GAM_VERSION = '6.25' +GAM_VERSION = '6.26' GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' GAM_URL = 'https://jaylee.us/gam' From 30069d303937e2f9472d9a4ca24edf5c1491c9fd Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 12 Oct 2022 12:00:07 -0400 Subject: [PATCH 08/37] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3c99084..b1898eef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,7 @@ jobs: with: path: | bin.tar.xz - key: gam-${{ matrix.jid }}-20221011 + key: gam-${{ matrix.jid }}-20221012 - name: Untar Cache archive if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' From 4935385572ee16ee6c1c25ae128aef8547fb0edf Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Mon, 17 Oct 2022 06:08:42 -0700 Subject: [PATCH 09/37] Pass lock (l) not one (1) to initargs (#1567) --- src/gam/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 9b94a4d8..96e93eb5 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -11244,7 +11244,7 @@ def run_batch(items): ) pool.close() pool.join() - pool = mp_pool(num_worker_threads, init_gam_worker, maxtasksperchild=200, initargs=(1,)) + pool = mp_pool(num_worker_threads, init_gam_worker, maxtasksperchild=200, initargs=(l,)) sys.stderr.write( 'commit-batch - running processes finished, proceeding\n') continue From 63ee0166913bffe1d0dccbd200b0b2e06ad62327 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Mon, 17 Oct 2022 13:51:45 -0400 Subject: [PATCH 10/37] Update build.yml --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1898eef..a89f222b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -429,8 +429,6 @@ jobs: git clone https://github.com/pyinstaller/pyinstaller.git cd pyinstaller export latest_release=$(git tag --list | grep -v dev | grep -v rc | sort -Vr | head -n1) - # temp freeze PyInstaller at 5.3 - export latest_release="v5.3" git checkout "${latest_release}" # remove pre-compiled bootloaders so we fail if bootloader compile fails rm -rvf PyInstaller/bootloader/*-*/* From d81c80b150e05e179530bc50739cdcdc4f5815d3 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Mon, 17 Oct 2022 13:56:42 -0400 Subject: [PATCH 11/37] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a89f222b..a0cd392f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,7 @@ jobs: with: path: | bin.tar.xz - key: gam-${{ matrix.jid }}-20221012 + key: gam-${{ matrix.jid }}-20221017 - name: Untar Cache archive if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' From a628aeb1a8ea610feae31c6918ac643e04e454bd Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Mon, 17 Oct 2022 14:54:35 -0400 Subject: [PATCH 12/37] Update build.yml --- .github/workflows/build.yml | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0cd392f..19f51d5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -397,6 +397,25 @@ jobs: run: | "${PYTHON}" -V + - name: Install PyInstaller + if: matrix.goal == 'build' + run: | + git clone https://github.com/pyinstaller/pyinstaller.git + cd pyinstaller + export latest_release=$(git tag --list | grep -v dev | grep -v rc | sort -Vr | head -n1) + git checkout "${latest_release}" + # remove pre-compiled bootloaders so we fail if bootloader compile fails + rm -rvf PyInstaller/bootloader/*-*/* + cd bootloader + if [[ "${arch}" == "Win32" ]]; then + export PYINSTALLER_BUILD_ARGS="--target-arch=32bit" + fi + echo "PyInstaller build arguments: ${PYINSTALLER_BUILD_ARGS}" + "${PYTHON}" ./waf all $PYINSTALLER_BUILD_ARGS + cd .. + echo "---- Installing PyInstaller ----" + "${PYTHON}" -m pip install . + - name: Upgrade pip, wheel, etc run: | curl -O https://bootstrap.pypa.io/get-pip.py @@ -423,25 +442,6 @@ jobs: "${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS} "${PYTHON}" -m pip list - - name: Install PyInstaller - if: matrix.goal == 'build' - run: | - git clone https://github.com/pyinstaller/pyinstaller.git - cd pyinstaller - export latest_release=$(git tag --list | grep -v dev | grep -v rc | sort -Vr | head -n1) - git checkout "${latest_release}" - # remove pre-compiled bootloaders so we fail if bootloader compile fails - rm -rvf PyInstaller/bootloader/*-*/* - cd bootloader - if [[ "${arch}" == "Win32" ]]; then - export PYINSTALLER_BUILD_ARGS="--target-arch=32bit" - fi - echo "PyInstaller build arguments: ${PYINSTALLER_BUILD_ARGS}" - "${PYTHON}" ./waf all $PYINSTALLER_BUILD_ARGS - cd .. - echo "---- Installing PyInstaller ----" - "${PYTHON}" -m pip install . - - name: Build GAM with PyInstaller if: matrix.goal != 'test' run: | From 9f985a7b2661e61ce325087b4fd3d1f457d6a82c Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Mon, 17 Oct 2022 15:30:26 -0400 Subject: [PATCH 13/37] Update build.yml --- .github/workflows/build.yml | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19f51d5a..618c6529 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -397,32 +397,13 @@ jobs: run: | "${PYTHON}" -V - - name: Install PyInstaller - if: matrix.goal == 'build' - run: | - git clone https://github.com/pyinstaller/pyinstaller.git - cd pyinstaller - export latest_release=$(git tag --list | grep -v dev | grep -v rc | sort -Vr | head -n1) - git checkout "${latest_release}" - # remove pre-compiled bootloaders so we fail if bootloader compile fails - rm -rvf PyInstaller/bootloader/*-*/* - cd bootloader - if [[ "${arch}" == "Win32" ]]; then - export PYINSTALLER_BUILD_ARGS="--target-arch=32bit" - fi - echo "PyInstaller build arguments: ${PYINSTALLER_BUILD_ARGS}" - "${PYTHON}" ./waf all $PYINSTALLER_BUILD_ARGS - cd .. - echo "---- Installing PyInstaller ----" - "${PYTHON}" -m pip install . - - name: Upgrade pip, wheel, etc run: | curl -O https://bootstrap.pypa.io/get-pip.py "${PYTHON}" get-pip.py "${PYTHON}" -m pip install --upgrade pip "${PYTHON}" -m pip install --upgrade wheel - "${PYTHON}" -m pip install --upgrade setuptools + "${PYTHON}" -m pip install --upgrade setuptools==65.4.1 - name: Install pip requirements run: | @@ -442,6 +423,25 @@ jobs: "${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS} "${PYTHON}" -m pip list + - name: Install PyInstaller + if: matrix.goal == 'build' + run: | + git clone https://github.com/pyinstaller/pyinstaller.git + cd pyinstaller + export latest_release=$(git tag --list | grep -v dev | grep -v rc | sort -Vr | head -n1) + git checkout "${latest_release}" + # remove pre-compiled bootloaders so we fail if bootloader compile fails + rm -rvf PyInstaller/bootloader/*-*/* + cd bootloader + if [[ "${arch}" == "Win32" ]]; then + export PYINSTALLER_BUILD_ARGS="--target-arch=32bit" + fi + echo "PyInstaller build arguments: ${PYINSTALLER_BUILD_ARGS}" + "${PYTHON}" ./waf all $PYINSTALLER_BUILD_ARGS + cd .. + echo "---- Installing PyInstaller ----" + "${PYTHON}" -m pip install . + - name: Build GAM with PyInstaller if: matrix.goal != 'test' run: | From e6829d0804b1e5de9ea6def1d3de9a408d0cc9fa Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Mon, 24 Oct 2022 16:51:58 -0400 Subject: [PATCH 14/37] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 618c6529..6c263e62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,7 @@ jobs: with: path: | bin.tar.xz - key: gam-${{ matrix.jid }}-20221017 + key: gam-${{ matrix.jid }}-20221024 - name: Untar Cache archive if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' From 976ef0252e0a73fd8008e83f8ff35b71200dabb7 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Mon, 24 Oct 2022 17:52:13 -0400 Subject: [PATCH 15/37] Update build.yml --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c263e62..37819ac6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -337,7 +337,7 @@ jobs: $env:OPENSSL_EXT_TARGET_PATH = "${env:OPENSSL_EXT_PATH}${env:PYEXTERNALS_PATH}" echo "Copying our OpenSSL to ${env:OPENSSL_EXT_TARGET_PATH}" mkdir "${env:OPENSSL_EXT_TARGET_PATH}\include\openssl\" - Copy-Item -Path "${env:GITHUB_WORKSPACE}/src/openssl-${env:openssl_archs}\LICENSE.txt" -Destination "${env:OPENSSL_EXT_TARGET_PATH}\LICENSE" + Copy-Item -Path "${env:GITHUB_WORKSPACE}/src/openssl-${env:openssl_archs}\LICENSE.txt" -Destination "${env:OPENSSL_EXT_TARGET_PATH}\LICENSE" -Verbose cp -v "$env:OPENSSL_INSTALL_PATH\lib\*" "${env:OPENSSL_EXT_TARGET_PATH}" cp -v "$env:OPENSSL_INSTALL_PATH\bin\*" "${env:OPENSSL_EXT_TARGET_PATH}" cp -v "$env:OPENSSL_INSTALL_PATH\include\openssl\*" "${env:OPENSSL_EXT_TARGET_PATH}\include\openssl\" @@ -357,7 +357,7 @@ jobs: run: | cd "${env:PYTHON_SOURCE_PATH}" # We need out custom openssl.props which uses OpenSSL 3 DLL names - Copy-Item -Path "${env:GITHUB_WORKSPACE}\src\tools\openssl.props" -Destination PCBuild\ + Copy-Item -Path "${env:GITHUB_WORKSPACE}\src\tools\openssl.props" -Destination PCBuild\ -Verbose echo "Building for ${env:PYBUILDRELEASE_ARCH}..." PCBuild\build.bat -m --pgo -c Release -p "${env:PYBUILDRELEASE_ARCH}" @@ -368,10 +368,10 @@ jobs: cd "${env:PYTHON_SOURCE_PATH}" mkdir "${env:PYTHON_INSTALL_PATH}\lib" mkdir "${env:PYTHON_INSTALL_PATH}\include" - Copy-Item -Path "PCBuild\${env:PYEXTERNALS_PATH}\*" "${env:PYTHON_INSTALL_PATH}\" - Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\Lib\*" "${env:PYTHON_INSTALL_PATH}\lib\" -recurse - Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\Include\*" "${env:PYTHON_INSTALL_PATH}\include\" -recurse - Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\PC\*.h" "${env:PYTHON_INSTALL_PATH}\include\" + Copy-Item -Path "PCBuild\${env:PYEXTERNALS_PATH}\*" "${env:PYTHON_INSTALL_PATH}\" -Verbose + Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\Lib\*" "${env:PYTHON_INSTALL_PATH}\lib\" -recurse -Verbose + Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\Include\*" "${env:PYTHON_INSTALL_PATH}\include\" -recurse -Verbose + Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\PC\*.h" "${env:PYTHON_INSTALL_PATH}\include\" -Verbose $env:Path = '${PYTHON_INSTALL_PATH}/bin' + $env:Path echo "Path=$env:Path" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "PATH: ${env:Path}" From 5519b33a08aee3d74635b485a5d44d7a5fb7e439 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Mon, 24 Oct 2022 17:54:55 -0400 Subject: [PATCH 16/37] Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37819ac6..979c07f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -189,6 +189,8 @@ jobs: echo "PYTHON=${PYTHON_INSTALL_PATH}\python.exe" >> $GITHUB_ENV echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV + # supposed to tell VS nmake to do parallel build + echo "CL=/MP" >> $GITHUB_ENV fi echo "We'll run make with: ${MAKEOPT}" echo "JID=${jid}" >> $GITHUB_ENV From a8a9cfb2ab78d83cf438690a1469292aca88271a Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Mon, 24 Oct 2022 18:03:11 -0400 Subject: [PATCH 17/37] Update build.yml --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 979c07f1..a7f000c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -189,8 +189,6 @@ jobs: echo "PYTHON=${PYTHON_INSTALL_PATH}\python.exe" >> $GITHUB_ENV echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV - # supposed to tell VS nmake to do parallel build - echo "CL=/MP" >> $GITHUB_ENV fi echo "We'll run make with: ${MAKEOPT}" echo "JID=${jid}" >> $GITHUB_ENV @@ -247,6 +245,9 @@ jobs: - name: Make OpenSSL if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true' run: | + if [[ "${RUNNER_OS}" == "Windows" ]]; then + export CL="/MP" + fi for openssl_arch in $openssl_archs; do cd "${GITHUB_WORKSPACE}/src/openssl-${openssl_arch}" $MAKE "${MAKEOPT}" From 9582e6840aa69af302acd778d07ca81003d1b7cf Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Mon, 24 Oct 2022 18:07:32 -0400 Subject: [PATCH 18/37] Update build.yml --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7f000c0..37819ac6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -245,9 +245,6 @@ jobs: - name: Make OpenSSL if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true' run: | - if [[ "${RUNNER_OS}" == "Windows" ]]; then - export CL="/MP" - fi for openssl_arch in $openssl_archs; do cd "${GITHUB_WORKSPACE}/src/openssl-${openssl_arch}" $MAKE "${MAKEOPT}" From 645fd9a135dcbca1370b4cff4e024e6e39d28ed0 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 25 Oct 2022 10:15:20 -0400 Subject: [PATCH 19/37] Update build.yml --- .github/workflows/build.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37819ac6..8d0fb263 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,6 +84,7 @@ jobs: with: path: | bin.tar.xz + src/cpython/PCbuild key: gam-${{ matrix.jid }}-20221024 - name: Untar Cache archive @@ -186,7 +187,7 @@ jobs: MAKE=nmake MAKEOPT="" PERL="c:\strawberry\perl\bin\perl.exe" - echo "PYTHON=${PYTHON_INSTALL_PATH}\python.exe" >> $GITHUB_ENV + echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV fi @@ -361,21 +362,6 @@ jobs: echo "Building for ${env:PYBUILDRELEASE_ARCH}..." PCBuild\build.bat -m --pgo -c Release -p "${env:PYBUILDRELEASE_ARCH}" - - name: Windows Install Python - if: matrix.goal == 'build' && runner.os == 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true' - shell: powershell - run: | - cd "${env:PYTHON_SOURCE_PATH}" - mkdir "${env:PYTHON_INSTALL_PATH}\lib" - mkdir "${env:PYTHON_INSTALL_PATH}\include" - Copy-Item -Path "PCBuild\${env:PYEXTERNALS_PATH}\*" "${env:PYTHON_INSTALL_PATH}\" -Verbose - Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\Lib\*" "${env:PYTHON_INSTALL_PATH}\lib\" -recurse -Verbose - Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\Include\*" "${env:PYTHON_INSTALL_PATH}\include\" -recurse -Verbose - Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\PC\*.h" "${env:PYTHON_INSTALL_PATH}\include\" -Verbose - $env:Path = '${PYTHON_INSTALL_PATH}/bin' + $env:Path - echo "Path=$env:Path" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - echo "PATH: ${env:Path}" - - name: Mac/Linux Build Python if: matrix.goal == 'build' && runner.os != 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true' run: | From 0986cb3fd9e68303ce24ffa1910d0c0f02f989e4 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 25 Oct 2022 19:17:16 -0400 Subject: [PATCH 20/37] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8d0fb263..5b7e5105 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -187,6 +187,7 @@ jobs: MAKE=nmake MAKEOPT="" PERL="c:\strawberry\perl\bin\perl.exe" + echo "PIP_ARGS=--no-binary=:all:" >> $GITHUB_ENV echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV From f859d0678b321419a7e2e1e9e8a1d7a42735620e Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 25 Oct 2022 20:19:09 -0400 Subject: [PATCH 21/37] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b7e5105..ee5b4ebc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -187,7 +187,6 @@ jobs: MAKE=nmake MAKEOPT="" PERL="c:\strawberry\perl\bin\perl.exe" - echo "PIP_ARGS=--no-binary=:all:" >> $GITHUB_ENV echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV @@ -406,6 +405,8 @@ jobs: "${PYTHON}" -m pip install --force-reinstall --no-deps $package*.whl done find $PYTHON_INSTALL_PATH/lib/python3.10/site-packages -type f -name "*.so" -exec du -sh "{}" \; + else + "${PYTHON}" -m pip install --upgrade --no-binary=:all: cryptography fi "${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS} "${PYTHON}" -m pip list From 34c7576cd5cf5ebaf095421d68c5958c49e3df99 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 26 Oct 2022 08:01:21 -0400 Subject: [PATCH 22/37] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee5b4ebc..2c06e5f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -187,6 +187,7 @@ jobs: MAKE=nmake MAKEOPT="" PERL="c:\strawberry\perl\bin\perl.exe" + echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" >> $GITHUB_ENV echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV From d171db36bc2fa85c87d15069d0e9c8147cfd11d6 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 26 Oct 2022 08:40:01 -0400 Subject: [PATCH 23/37] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c06e5f1..bd4dc9f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,6 +156,7 @@ jobs: openssl_archs: ${{ matrix.openssl_archs }} run: | echo "We are running on ${RUNNER_OS}" + echo "LD_LIBRARY_PATH=${OPENSSL_INSTALL_PATH}/lib:${PYTHON_INSTALL_PATH}/lib" >> $GITHUB_ENV if [[ "${arch}" == "Win64" ]]; then PYEXTERNALS_PATH="amd64" PYBUILDRELEASE_ARCH="x64" @@ -201,7 +202,6 @@ jobs: echo "PYEXTERNALS_PATH=${PYEXTERNALS_PATH}" >> $GITHUB_ENV echo "PYBUILDRELEASE_ARCH=${PYBUILDRELEASE_ARCH}" >> $GITHUB_ENV echo "openssl_archs=${openssl_archs}" >> $GITHUB_ENV - echo "LD_LIBRARY_PATH=${OPENSSL_INSTALL_PATH}/lib:${PYTHON_INSTALL_PATH}/lib" >> $GITHUB_ENV - name: Get latest stable OpenSSL source if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true' From f3169a631ccacd3afc6f17e63e6e3aebce0d61d3 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 26 Oct 2022 08:44:31 -0400 Subject: [PATCH 24/37] Update build.yml --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd4dc9f3..a3a8f0b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,7 +156,7 @@ jobs: openssl_archs: ${{ matrix.openssl_archs }} run: | echo "We are running on ${RUNNER_OS}" - echo "LD_LIBRARY_PATH=${OPENSSL_INSTALL_PATH}/lib:${PYTHON_INSTALL_PATH}/lib" >> $GITHUB_ENV + LD_LIBRARY_PATH="${OPENSSL_INSTALL_PATH}/lib:${PYTHON_INSTALL_PATH}/lib" if [[ "${arch}" == "Win64" ]]; then PYEXTERNALS_PATH="amd64" PYBUILDRELEASE_ARCH="x64" @@ -188,7 +188,7 @@ jobs: MAKE=nmake MAKEOPT="" PERL="c:\strawberry\perl\bin\perl.exe" - echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" >> $GITHUB_ENV + LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV @@ -196,6 +196,7 @@ jobs: echo "We'll run make with: ${MAKEOPT}" echo "JID=${jid}" >> $GITHUB_ENV echo "arch=${arch}" >> $GITHUB_ENV + echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV echo "MAKE=${MAKE}" >> $GITHUB_ENV echo "MAKEOPT=${MAKEOPT}" >> $GITHUB_ENV echo "PERL=${PERL}" >> $GITHUB_ENV From baf822c685f3d3722c2298fd11df62ac5f989857 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 26 Oct 2022 09:59:32 -0400 Subject: [PATCH 25/37] Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a3a8f0b7..67d2cb24 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -189,6 +189,8 @@ jobs: MAKEOPT="" PERL="c:\strawberry\perl\bin\perl.exe" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" + echo "LIB=${OPENSSL_INSTALL_PATH}/lib:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" >> $GITHUB_ENV + echo "INCLUDE=${OPENSSL_INSTALL_PATH}/include:${PYTHON_SOURCE_PATH}/include" >> $GITHUB_ENV echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV From 844a2fe1e8ac463d16ea4af600506b6a430a767c Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 26 Oct 2022 10:03:44 -0400 Subject: [PATCH 26/37] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 67d2cb24..818c74d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -189,8 +189,6 @@ jobs: MAKEOPT="" PERL="c:\strawberry\perl\bin\perl.exe" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" - echo "LIB=${OPENSSL_INSTALL_PATH}/lib:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" >> $GITHUB_ENV - echo "INCLUDE=${OPENSSL_INSTALL_PATH}/include:${PYTHON_SOURCE_PATH}/include" >> $GITHUB_ENV echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV echo "GAM_ARCHIVE_ARCH=${GAM_ARCHIVE_ARCH}" >> $GITHUB_ENV echo "WIX_ARCH=${WIX_ARCH}" >> $GITHUB_ENV @@ -410,6 +408,8 @@ jobs: done find $PYTHON_INSTALL_PATH/lib/python3.10/site-packages -type f -name "*.so" -exec du -sh "{}" \; else + export LIB="${OPENSSL_INSTALL_PATH}/lib:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" + export INCLUDE="${OPENSSL_INSTALL_PATH}/include:${PYTHON_SOURCE_PATH}/include" "${PYTHON}" -m pip install --upgrade --no-binary=:all: cryptography fi "${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS} From d7b2f82a4a34bfc5372294ee692a73d0f22e5be5 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 26 Oct 2022 11:39:32 -0400 Subject: [PATCH 27/37] Update build.yml --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 818c74d4..2c98991a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -391,7 +391,7 @@ jobs: "${PYTHON}" get-pip.py "${PYTHON}" -m pip install --upgrade pip "${PYTHON}" -m pip install --upgrade wheel - "${PYTHON}" -m pip install --upgrade setuptools==65.4.1 + "${PYTHON}" -m pip install --upgrade setuptools - name: Install pip requirements run: | @@ -408,9 +408,8 @@ jobs: done find $PYTHON_INSTALL_PATH/lib/python3.10/site-packages -type f -name "*.so" -exec du -sh "{}" \; else - export LIB="${OPENSSL_INSTALL_PATH}/lib:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" - export INCLUDE="${OPENSSL_INSTALL_PATH}/include:${PYTHON_SOURCE_PATH}/include" - "${PYTHON}" -m pip install --upgrade --no-binary=:all: cryptography + "${PYTHON}" -m pip install --upgrade --no-binary=:all: cffi + "${PYTHON}" -m pip install --upgrade cryptography fi "${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS} "${PYTHON}" -m pip list From 6d4524c153791a6dcc790bae99a6737056330671 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Wed, 26 Oct 2022 14:36:53 -0700 Subject: [PATCH 28/37] Update var.py (#1571) --- src/gam/var.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gam/var.py b/src/gam/var.py index 106e749f..3d45e9e9 100644 --- a/src/gam/var.py +++ b/src/gam/var.py @@ -648,6 +648,7 @@ MACOS_CODENAMES = { }, 11: 'Big Sur', 12: 'Monterey', + 13: 'Ventura', } _MICROSOFT_FORMATS_LIST = [{ From 4a4b22dfba9007afb444b79ae33df65dcca26bb0 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 28 Oct 2022 08:30:26 -0400 Subject: [PATCH 29/37] Update build.yml --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c98991a..aea61adc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -440,6 +440,10 @@ jobs: mkdir -p -v "${gampath}" if [[ "${RUNNER_OS}" == "macOS" ]]; then export gampath=$($PYTHON -c "import os; print(os.path.realpath('$gampath'))") + elif [[ "${RUNNER_OS}" == "Windows" ]]; then + # Work around issue where PyInstaller picks up python3.dll from other Python versions + # https://github.com/pyinstaller/pyinstaller/issues/7102 + export PATH="/usr/bin" else export gampath=$(realpath "${gampath}") fi From 6a721ac2c13bec9e6b0710b9a1542f10f49ef7ed Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 28 Oct 2022 09:25:08 -0400 Subject: [PATCH 30/37] [no ci] --- .github/workflows/build.yml | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aea61adc..ca1a4889 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -396,20 +396,14 @@ jobs: - name: Install pip requirements run: | if [[ "${RUNNER_OS}" == "macOS" ]]; then - for package in cryptography; do - "${PYTHON}" -m pip install --upgrade cffi ${PIP_ARGS} - "${PYTHON}" -m pip download --only-binary :all: \ + "${PYTHON}" -m pip install --upgrade cffi ${PIP_ARGS} + "${PYTHON}" -m pip download --only-binary :all: \ --dest . \ --no-cache \ --no-deps \ --platform macosx_10_15_universal2 \ - $package - "${PYTHON}" -m pip install --force-reinstall --no-deps $package*.whl - done - find $PYTHON_INSTALL_PATH/lib/python3.10/site-packages -type f -name "*.so" -exec du -sh "{}" \; - else - "${PYTHON}" -m pip install --upgrade --no-binary=:all: cffi - "${PYTHON}" -m pip install --upgrade cryptography + cryptography + "${PYTHON}" -m pip install --force-reinstall --no-deps cryptography*.whl fi "${PYTHON}" -m pip install --upgrade -r requirements.txt ${PIP_ARGS} "${PYTHON}" -m pip list @@ -697,17 +691,6 @@ jobs: #echo "using delegated admin service account" #$gam print users - # - name: Upload to Google Drive, build only. - # if: github.event_name == 'push' && matrix.goal != 'test' - # run: | - # ls gam-$GAMVERSION-* - # for gamfile in gam-$GAMVERSION-*; do - # echo "Uploading file ${gamfile} to Google Drive..." - # fileid=$($gam user $gam_user add drivefile localfile $gamfile drivefilename $GAMVERSION-${GITHUB_SHA:0:7}-$gamfile parentid 1N2zbO33qzUQFsGM49-m9AQC1ijzd_ru1 returnidonly) - # echo "file uploaded as ${fileid}, setting ACL..." - # $gam user $gam_user add drivefileacl $fileid anyone role reader withlink - # done - - name: Archive production artifacts uses: actions/upload-artifact@v3 if: (github.event_name == 'push' || github.event_name == 'schedule') && matrix.goal != 'test' From 24cfe807e6a274a0a145b93951b55610c2228b82 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Fri, 28 Oct 2022 09:35:42 -0400 Subject: [PATCH 31/37] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca1a4889..3ebca94e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: arch: x86_64 - os: ubuntu-22.04 goal: test - python: "3.11-dev" + python: "3.10" jid: 10 arch: x86_64 @@ -85,7 +85,7 @@ jobs: path: | bin.tar.xz src/cpython/PCbuild - key: gam-${{ matrix.jid }}-20221024 + key: gam-${{ matrix.jid }}-20221027 - name: Untar Cache archive if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' From f412d5ad4cee19b5a5dc1e546741bfa00c959c9c Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Sat, 29 Oct 2022 10:12:33 -0400 Subject: [PATCH 32/37] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ebca94e..949f57a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,8 +84,8 @@ jobs: with: path: | bin.tar.xz - src/cpython/PCbuild - key: gam-${{ matrix.jid }}-20221027 + src/cpython + key: gam-${{ matrix.jid }}-20221029 - name: Untar Cache archive if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' From dc22b024b88c0463fa137f65900494d0428f3abd Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Sat, 29 Oct 2022 11:21:00 -0400 Subject: [PATCH 33/37] Try disabling check hostname on time checks --- src/gam/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 96e93eb5..d97fd139 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -640,6 +640,7 @@ def getLocalGoogleTimeOffset(testLocation='admin.googleapis.com'): # is way off. This could be spoofed / MitM but we'll fail for those # situations everywhere else but here. badhttp = transport.create_http() + badhttp.check_hostname = False badhttp.disable_ssl_certificate_validation = True googleUTC = dateutil.parser.parse( badhttp.request('https://' + testLocation, 'HEAD')[0]['date']) From 37e3fd904dfaa65b74b5441792c124191613fe2e Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Sun, 30 Oct 2022 05:22:58 -0700 Subject: [PATCH 34/37] Rework getting local-Google time offset (#1572) --- src/gam/__init__.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/gam/__init__.py b/src/gam/__init__.py index d97fd139..60c27012 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -634,28 +634,28 @@ TIME_OFFSET_UNITS = [('day', 86400), ('hour', 3600), ('minute', 60), def getLocalGoogleTimeOffset(testLocation='admin.googleapis.com'): - localUTC = datetime.datetime.now(datetime.timezone.utc) - try: - # we disable SSL verify so we can still get time even if clock - # is way off. This could be spoofed / MitM but we'll fail for those - # situations everywhere else but here. - badhttp = transport.create_http() - badhttp.check_hostname = False - badhttp.disable_ssl_certificate_validation = True - googleUTC = dateutil.parser.parse( - badhttp.request('https://' + testLocation, 'HEAD')[0]['date']) - except (httplib2.ServerNotFoundError, RuntimeError, ValueError) as e: - controlflow.system_error_exit(4, str(e)) - offset = remainder = int(abs((localUTC - googleUTC).total_seconds())) - timeoff = [] - for tou in TIME_OFFSET_UNITS: - uval, remainder = divmod(remainder, tou[1]) - if uval: - timeoff.append(f'{uval} {tou[0]}{"s" if uval != 1 else ""}') - if not timeoff: - timeoff.append('less than 1 second') - nicetime = ', '.join(timeoff) - return (offset, nicetime) + # Try with http first, if time is close ( Date: Tue, 1 Nov 2022 07:54:38 -0400 Subject: [PATCH 35/37] GAM 6.30 To be released soon after OpenSSL 3.0.7... --- src/gam/var.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gam/var.py b/src/gam/var.py index 3d45e9e9..ce73ee4b 100644 --- a/src/gam/var.py +++ b/src/gam/var.py @@ -8,7 +8,7 @@ import platform import re GAM_AUTHOR = 'Jay Lee ' -GAM_VERSION = '6.26' +GAM_VERSION = '6.30' GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' GAM_URL = 'https://jaylee.us/gam' From 41965e962df9a546a10d421d19a2a22fc287b69d Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 1 Nov 2022 14:39:36 -0400 Subject: [PATCH 36/37] rebuild to pickup OpenSSL 3.0.7 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 949f57a2..a14f4379 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,7 +85,7 @@ jobs: path: | bin.tar.xz src/cpython - key: gam-${{ matrix.jid }}-20221029 + key: gam-${{ matrix.jid }}-20221101 - name: Untar Cache archive if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true' From 55555506bedfc2b32483b0821b08c2535f1838c5 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Tue, 1 Nov 2022 16:32:15 -0400 Subject: [PATCH 37/37] Update decrypt.sh --- .github/actions/decrypt.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/decrypt.sh b/.github/actions/decrypt.sh index 06ed9c8c..76051ea5 100644 --- a/.github/actions/decrypt.sh +++ b/.github/actions/decrypt.sh @@ -14,4 +14,5 @@ gpg --quiet --batch --yes --decrypt --passphrase="${PASSCODE}" \ --output "${credsfile}" "${gpgfile}" tar xvvf "${credsfile}" --directory "${gampath}" -ls -l "${gampath}" +rm -rvf "${gpgfile}" +rm -rvf "${credsfile}"