Skip to content

Commit da96648

Browse files
committed
Enable back snapshots publishing
Ref: duckdb#546
1 parent f283601 commit da96648

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/Java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ jobs:
734734
# SNAPSHOTs don't require GPG signatures or validation
735735
# See: https://central.sonatype.org/publish/publish-portal-snapshots/
736736
maven-snapshot-deploy:
737-
if: ${{ false && github.repository == 'duckdb/duckdb-java' && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
737+
if: ${{ github.repository == 'duckdb/duckdb-java' && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
738738
name: Maven SNAPSHOT Deploy
739739
runs-on: ubuntu-latest
740740
timeout-minutes: 30

scripts/jdbc_maven_deploy_snapshot.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ def get_snapshot_version():
6868
"""
6969
Calculate SNAPSHOT version from the last release tag and current commit.
7070
71-
DuckDB uses 4-part versioning (e.g., v1.4.4.0). We increment the third
72-
component (patch) and reset the fourth to 0 for SNAPSHOTs.
73-
Example: v1.4.4.0 + commit abc1234 -> 1.4.5.0-abc1234-SNAPSHOT
71+
DuckDB uses 4-part versioning (e.g., v1.4.4.0). We increment the second
72+
component (minor) and remove the third and fourth for SNAPSHOTs.
73+
Example: v1.4.4.0 + commit abc1234 -> 1.5-abc1234-SNAPSHOT
7474
"""
7575
last_tag = run_cmd('git tag --sort=-committerdate').split('\n')[0]
7676
version_regex = re.compile(r'^v(\d+)\.(\d+)\.(\d+)\.(\d+)$')
@@ -84,7 +84,7 @@ def get_snapshot_version():
8484
# Get short commit hash for traceability
8585
commit_hash = run_cmd('git rev-parse --short HEAD')
8686
# Increment patch version and include commit hash
87-
return f"{major}.{minor}.{patch + 1}.0-{commit_hash}-SNAPSHOT"
87+
return f"{major}.{minor + 1}-{commit_hash}-SNAPSHOT"
8888

8989

9090
def create_settings_xml(settings_path):

0 commit comments

Comments
 (0)