Skip to content

Commit e9b845e

Browse files
committed
Fix version skipping issue in release workflow
- Move version bumping to AFTER JitPack build succeeds - Only push tag immediately, defer main branch push - Prevents version gaps when JitPack monitoring fails - Ensures failed releases don't consume version numbers
1 parent 6990a7d commit e9b845e

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

.github/workflows/release.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,8 @@ jobs:
9292
git commit -m "Release version $NEW_VERSION"
9393
git tag -a "v$NEW_VERSION" -m "Release version $NEW_VERSION"
9494
95-
- name: Prepare next development version
95+
- name: Push release tag
9696
run: |
97-
# Calculate next development version
98-
NEXT_DEV_VERSION=$(echo $NEW_VERSION | awk -F. '{print $1"."$2"."($3+1)"-SNAPSHOT"}')
99-
100-
# Update to next development version
101-
sed -i "s/<dynamodb-toolkit.version>.*<\/dynamodb-toolkit.version>/<dynamodb-toolkit.version>$NEXT_DEV_VERSION<\/dynamodb-toolkit.version>/" pom.xml
102-
sed -i "s/<dynamodb-toolkit.version>.*<\/dynamodb-toolkit.version>/<dynamodb-toolkit.version>$NEXT_DEV_VERSION<\/dynamodb-toolkit.version>/" integration-tests/pom.xml
103-
104-
git add pom.xml integration-tests/pom.xml
105-
git commit -m "Bump to next development version $NEXT_DEV_VERSION"
106-
107-
- name: Push changes and tags
108-
run: |
109-
# Pull latest changes to avoid conflicts
110-
git pull --rebase origin main
111-
git push origin main
11297
git push origin "v$NEW_VERSION"
11398
11499
- name: Create GitHub Release
@@ -192,4 +177,20 @@ jobs:
192177
193178
sleep 30
194179
attempt=$((attempt + 1))
195-
done
180+
done
181+
182+
- name: Finalize release
183+
run: |
184+
# Calculate next development version
185+
NEXT_DEV_VERSION=$(echo $NEW_VERSION | awk -F. '{print $1"."$2"."($3+1)"-SNAPSHOT"}')
186+
187+
# Update to next development version
188+
sed -i "s/<dynamodb-toolkit.version>.*<\/dynamodb-toolkit.version>/<dynamodb-toolkit.version>$NEXT_DEV_VERSION<\/dynamodb-toolkit.version>/" pom.xml
189+
sed -i "s/<dynamodb-toolkit.version>.*<\/dynamodb-toolkit.version>/<dynamodb-toolkit.version>$NEXT_DEV_VERSION<\/dynamodb-toolkit.version>/" integration-tests/pom.xml
190+
191+
git add pom.xml integration-tests/pom.xml
192+
git commit -m "Bump to next development version $NEXT_DEV_VERSION"
193+
194+
# Push to main branch
195+
git pull --rebase origin main
196+
git push origin main

0 commit comments

Comments
 (0)