From 52601edb35085133427c6f042619583f10df0d85 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 18 Sep 2024 11:46:43 -0400 Subject: [PATCH 1/3] [no ci] remove 3.8 testing. Fixes #1702 --- .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 b8497a4e..b7a082f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,7 @@ jobs: openssl_archs: VC-WIN64A - os: ubuntu-22.04 goal: test - python: "3.8" + python: "3.13" jid: 10 arch: x86_64 - os: ubuntu-22.04 From 2b8b2521d18a83af42b3db6d8c58b86b3b3ef732 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 18 Sep 2024 12:57:42 -0400 Subject: [PATCH 2/3] actions: hack to make gam7 the folder for mac/linux packages --- .github/workflows/build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7a082f6..f8d7a081 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -301,7 +301,8 @@ jobs: - name: Rename GNU link on Windows if: matrix.goal == 'build' && runner.os == 'Windows' && steps.cache-python-ssl.outputs.cache-hit != 'true' shell: bash - run: mv /usr/bin/link /usr/bin/gnulink + run: | + mv -v /usr/bin/link /usr/bin/gnulink - name: Make OpenSSL if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true' @@ -319,7 +320,7 @@ jobs: cd "${GITHUB_WORKSPACE}/src/openssl-${openssl_arch}" # install_sw saves us ages processing man pages :-) $MAKE install_sw - mv "${OPENSSL_INSTALL_PATH}" "${GITHUB_WORKSPACE}/bin/ssl-${openssl_arch}" + mv -v "${OPENSSL_INSTALL_PATH}" "${GITHUB_WORKSPACE}/bin/ssl-${openssl_arch}" done mkdir -vp "${OPENSSL_INSTALL_PATH}/lib" mkdir -vp "${OPENSSL_INSTALL_PATH}/bin" @@ -648,7 +649,9 @@ jobs: GAM_ARCHIVE="gam-${GAMVERSION}-linux-$(arch)-${libver}.tar.xz" fi echo "GAM Archive ${GAM_ARCHIVE}" - tar -C dist/ --create --verbose --exclude-from "${GITHUB_WORKSPACE}/.github/actions/package_exclusions.txt" --file $GAM_ARCHIVE --xz gam + mv -v gam gam7 + tar -C dist/ --create --verbose --exclude-from "${GITHUB_WORKSPACE}/.github/actions/package_exclusions.txt" --file $GAM_ARCHIVE --xz gam7 + mv -v gam7 gam - name: Windows package if: runner.os == 'Windows' && matrix.goal != 'test' From 281e79026082182a83419eb29b8dcce5de88244e Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 18 Sep 2024 13:04:45 -0400 Subject: [PATCH 3/3] actions: fix gam/gam7 path --- .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 f8d7a081..23ab12eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -649,9 +649,9 @@ jobs: GAM_ARCHIVE="gam-${GAMVERSION}-linux-$(arch)-${libver}.tar.xz" fi echo "GAM Archive ${GAM_ARCHIVE}" - mv -v gam gam7 + mv -v dist/gam dist/gam7 tar -C dist/ --create --verbose --exclude-from "${GITHUB_WORKSPACE}/.github/actions/package_exclusions.txt" --file $GAM_ARCHIVE --xz gam7 - mv -v gam7 gam + mv -v dist/gam7 dist/gam - name: Windows package if: runner.os == 'Windows' && matrix.goal != 'test'