diff --git a/.github/workflows/check-and-bump-versions.yaml b/.github/workflows/check-and-bump-versions.yaml index 1cba867821..3bda1b0ed0 100644 --- a/.github/workflows/check-and-bump-versions.yaml +++ b/.github/workflows/check-and-bump-versions.yaml @@ -269,12 +269,19 @@ jobs: DIFF=$(git diff HEAD~1 HEAD -- package.json) fi - # Count number of changed lines that aren't the version field - NON_VERSION_CHANGES=$(echo "$DIFF" | grep -v '"version":' | grep '^[+-]' | wc -l) + # Extract the changes, excluding whitespace-only changes + CHANGES=$(echo "$DIFF" | grep '^[+-]' | grep -v '^[+-]$' | grep -v '^[+-]\s*$') - # If there are no non-version changes, return true (1) + # Count lines that aren't the version field or the final newline + NON_VERSION_CHANGES=$(echo "$CHANGES" | grep -v '"version":' | grep -v '^[+-]$' | wc -l | tr -d ' ') + + # If there are no non-version changes, return success (0) if [ "$NON_VERSION_CHANGES" -eq 0 ]; then - return 0 + # Double check that version field is the only thing that changed + VERSION_CHANGES=$(echo "$CHANGES" | grep '"version":' | wc -l | tr -d ' ') + if [ "$VERSION_CHANGES" -eq 2 ]; then # One line removed, one line added + return 0 + fi fi return 1 } @@ -299,8 +306,15 @@ jobs: if check_package_json_changes; then echo "Only version field changed in package.json, skipping version bump" SHOULD_BUMP=false + # Update checksum without bumping version + echo "$NEW_CHECKSUM" > .checksum + if [ -n "$(git status --porcelain .checksum)" ]; then + git add .checksum + git commit -m "chore(@tutur3u/${package}): update checksum [skip ci]" + git push origin HEAD + fi else - echo "Package.json has meaningful changes" + echo "Package.json has meaningful changes beyond version" SHOULD_BUMP=true fi else diff --git a/packages/supabase/.checksum b/packages/supabase/.checksum index f5a01f4736..bd5ab8d2e5 100644 --- a/packages/supabase/.checksum +++ b/packages/supabase/.checksum @@ -1 +1 @@ -bc9ff7c34b97903033b4f7c841fd9dc3535157330f0d799cbb6bc2cc28df7d5d +9cbf3632188207267fbc27ba24f7b07ce9f26f1887aad1871a089f5ea10d9d30 diff --git a/packages/supabase/package.json b/packages/supabase/package.json index a1d0f1b3bb..6c7e0739f9 100644 --- a/packages/supabase/package.json +++ b/packages/supabase/package.json @@ -1,7 +1,7 @@ { "name": "@tutur3u/supabase", "license": "MIT", - "version": "0.0.5", + "version": "0.0.8", "publishConfig": { "access": "public" }, diff --git a/packages/types/.checksum b/packages/types/.checksum index f72dd84c44..725c2fe0c7 100644 --- a/packages/types/.checksum +++ b/packages/types/.checksum @@ -1 +1 @@ -923117d60c2cbfe0f6efd185056f81cf9777e2be4aba7ed82cfb87680db9c2d1 +4dd90552007cb4ed77906f9b79c2fe95752782fac6e16b353b63f02edeb60d8f diff --git a/packages/types/package.json b/packages/types/package.json index 802162b899..05f56527b3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,7 +1,7 @@ { "name": "@tutur3u/types", "license": "MIT", - "version": "0.1.4", + "version": "0.1.6", "publishConfig": { "access": "public" },