From ccd22c94f3508820e84d8f149972e6d431683c37 Mon Sep 17 00:00:00 2001 From: Andrew Bassett <43486400+apbassett@users.noreply.github.com> Date: Thu, 31 Oct 2024 14:47:58 -0400 Subject: [PATCH 1/3] 22065: Disables attestations when publishing to PyPi (#136) --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7159991..a10b802 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -300,6 +300,9 @@ jobs: - name: Publish [PyPi] uses: pypa/gh-action-pypi-publish@release/v1 + with: + # Experimental feature not yet compatible with our workflow + attestations: False generate-changelog: if: inputs.build-type == 'release' From 43b030ff99266fd507511e474dc14d8be9e12c50 Mon Sep 17 00:00:00 2001 From: Andrew Bassett <43486400+apbassett@users.noreply.github.com> Date: Mon, 4 Nov 2024 15:16:03 -0500 Subject: [PATCH 2/3] 00000: Bumps Amalgam version, MAJOR (#137) --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 622a991..0aee898 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { "dependencies": { - "amalgam": "55.1.1" + "amalgam": "56.0.0" } } From 108d1ee74b8b319b200369e894442b9253a8a337 Mon Sep 17 00:00:00 2001 From: Will Goddin Date: Tue, 19 Nov 2024 14:05:04 -0500 Subject: [PATCH 3/3] 22210: Adds manylinux_2_28_x86_64, bumps Amalgam version, MAJOR (#138) - add manylinux_2_28_x86_64 package --------- Co-authored-by: Will Goddin <12643163+wgoddin@users.noreply.github.com> Co-authored-by: apbassett <43486400+apbassett@users.noreply.github.com> --- .github/workflows/build.yml | 26 ++++++++++++++++++++++++-- version.json | 2 +- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a10b802..843f7e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - plat: [manylinux_2_29_x86_64, manylinux_2_29_aarch64, macosx_12_0_x86_64, macosx_12_0_arm64, win_amd64, any] + plat: [manylinux_2_28_x86_64, manylinux_2_29_x86_64, manylinux_2_29_aarch64, macosx_12_0_x86_64, macosx_12_0_arm64, win_amd64, any] steps: @@ -77,7 +77,29 @@ jobs: run: | run_id=$(printf "%s" '${{ needs.metadata.outputs.upstream-details }}' | jq -r '."amalgam".run_id') run_type=$(printf "%s" '${{ needs.metadata.outputs.upstream-details }}' | jq -r '."amalgam".run_type') - gh $run_type download -D amalgam/lib/linux/amd64 -R "howsoai/amalgam" -p "*linux-amd64*" "$run_id" + # Release artifacts will have a .tar.gz postfix while branch/PR build artifacts will not + if [[ "$run_type" == "release" ]]; then + gh $run_type download -D amalgam/lib/linux/amd64 -R "howsoai/amalgam" -p "amalgam-*-linux-amd64.tar.gz" "$run_id" + else + gh $run_type download -D amalgam/lib/linux/amd64 -R "howsoai/amalgam" -p "amalgam-*-linux-amd64" "$run_id" + fi + # Needed because release/non-release downloads are different structure + cd amalgam/lib/linux/amd64 && if [ ! -f *.tar.gz ]; then mv */*.tar.gz ./; fi && tar -xvzf *.tar.gz + + - name: Download Amalgam linux-amd64-228 + # Linux version that supports GLIBC 2.28+, most users should use 2.29+ (above) + # This specifically does NOT run on the "any" platform target. + if: matrix.plat == 'manylinux_2_28_x86_64' + env: + GH_TOKEN: ${{ github.token }} + run: | + run_id=$(printf "%s" '${{ needs.metadata.outputs.upstream-details }}' | jq -r '."amalgam".run_id') + run_type=$(printf "%s" '${{ needs.metadata.outputs.upstream-details }}' | jq -r '."amalgam".run_type') + if [[ "$run_type" == "release" ]]; then + gh $run_type download -D amalgam/lib/linux/amd64 -R "howsoai/amalgam" -p "amalgam-*-linux-amd64-228.tar.gz" "$run_id" + else + gh $run_type download -D amalgam/lib/linux/amd64 -R "howsoai/amalgam" -p "amalgam-*-linux-amd64-228" "$run_id" + fi # Needed because release/non-release downloads are different structure cd amalgam/lib/linux/amd64 && if [ ! -f *.tar.gz ]; then mv */*.tar.gz ./; fi && tar -xvzf *.tar.gz diff --git a/version.json b/version.json index 0aee898..12cc5ad 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { "dependencies": { - "amalgam": "56.0.0" + "amalgam": "57.0.1" } }