diff --git a/.github/workflows/CI-update_runpod_pkg.yml b/.github/workflows/CI-update_runpod_pkg.yml index 2485d56..7ddcdd7 100644 --- a/.github/workflows/CI-update_runpod_pkg.yml +++ b/.github/workflows/CI-update_runpod_pkg.yml @@ -22,8 +22,8 @@ jobs: run: | echo "Fetching the current runpod version from requirements.txt..." - # Get current version, allowing for '~=' operator - current_version=$(grep -oP 'runpod~=\K[^ ]+' ./builder/requirements.txt) + # Get current version (supports '>=' versioning) + current_version=$(grep -oP 'runpod>=\K[^ ]+' ./builder/requirements.txt) echo "Current version: $current_version" # Get new version from PyPI @@ -36,23 +36,28 @@ jobs: exit 1 fi - # Extract major and minor from current version (e.g., 1.7) - current_major_minor=$(echo $current_version | cut -d. -f1,2) - new_major_minor=$(echo $new_version | cut -d. -f1,2) + if [ -z "$current_version" ]; then + echo "ERROR: Failed to extract current version from requirements.txt." + exit 1 + fi - echo "Current major.minor: $current_major_minor" - echo "New major.minor: $new_major_minor" + # Compare versions using sort -V (version sort) + if [ "$current_version" = "$new_version" ]; then + echo "No update needed. Already at version $new_version." + exit 0 + fi - # Check if the new version is within the current major.minor range (e.g., 1.7.x) - if [ "$new_major_minor" = "$current_major_minor" ]; then - echo "No update needed. The new version ($new_version) is within the allowed range (~= $current_major_minor)." + # Check if new version is actually newer + newer_version=$(printf "%s\n%s" "$current_version" "$new_version" | sort -V | tail -n1) + if [ "$newer_version" = "$current_version" ]; then + echo "No update needed. Current version ($current_version) is already >= new version ($new_version)." exit 0 fi - echo "New major/minor detected ($new_major_minor). Updating runpod version..." + echo "New version detected ($new_version > $current_version). Updating runpod version..." - # Update requirements.txt with the new version while keeping '~=' - sed -i "s/runpod~=.*/runpod~=$new_version/" ./builder/requirements.txt + # Update requirements.txt with the new version while keeping '>=' + sed -i "s/runpod>=.*/runpod>=$new_version/" ./builder/requirements.txt echo "requirements.txt has been updated." - name: Create Pull Request diff --git a/builder/requirements.txt b/builder/requirements.txt index 8e062df..d517da0 100644 --- a/builder/requirements.txt +++ b/builder/requirements.txt @@ -1,6 +1,6 @@ # Required Python packages get listed here, one per line. -# Reccomended to lock the version number to avoid unexpected changes. +# Recommended to lock the version number to avoid unexpected changes. -runpod~=1.7.0 +runpod>=1.8.0 requests==2.31.0