From bd6f2c4f74c37ed82586562f8e65478209a0f766 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Wed, 16 Jul 2025 16:50:43 +0200 Subject: [PATCH] Fully match version --- .github/workflows/merge.yml | 5 +---- .github/workflows/verify.yml | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index c20366dd9..6d6af5cd0 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -40,12 +40,9 @@ jobs: PACKAGE_VERSION=$(python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])") PACKAGE_NAME=$(python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])") - # Use jq to check for the version in the releases object - EXISTING_VERSIONS=$(curl -s "https://pypi.org/pypi/$PACKAGE_NAME/json" | jq '.releases | keys[]') - echo "Checking for package: $PACKAGE_NAME==$PACKAGE_VERSION" - if [[ "$EXISTING_VERSIONS" =~ "$PACKAGE_VERSION" ]]; then + if curl -s "https://pypi.org/pypi/$PACKAGE_NAME/json" | jq -r '.releases | keys[]' | grep -q "^$PACKAGE_VERSION$"; then echo "Package version already exists. Skipping upload." echo "should_publish=false" >> $GITHUB_OUTPUT else diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 4c91efca9..26a3361cd 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -298,12 +298,9 @@ jobs: PACKAGE_VERSION=$(python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])") PACKAGE_NAME=$(python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])") - # Use jq to check for the version in the releases object - EXISTING_VERSIONS=$(curl -s "https://test.pypi.org/pypi/$PACKAGE_NAME/json" | jq '.releases | keys[]') - echo "Checking for package: $PACKAGE_NAME==$PACKAGE_VERSION" - if [[ "$EXISTING_VERSIONS" =~ "$PACKAGE_VERSION" ]]; then + if curl -s "https://test.pypi.org/pypi/$PACKAGE_NAME/json" | jq -r '.releases | keys[]' | grep -q "^$PACKAGE_VERSION$"; then echo "Package version already exists. Skipping upload." echo "should_publish=false" >> $GITHUB_OUTPUT else