diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml index 258f762b5..834be265c 100644 --- a/.github/workflows/Java.yml +++ b/.github/workflows/Java.yml @@ -734,7 +734,7 @@ jobs: # SNAPSHOTs don't require GPG signatures or validation # See: https://central.sonatype.org/publish/publish-portal-snapshots/ maven-snapshot-deploy: - if: ${{ false && github.repository == 'duckdb/duckdb-java' && github.ref == 'refs/heads/main' && github.event_name == 'push' }} + if: ${{ github.repository == 'duckdb/duckdb-java' && github.ref == 'refs/heads/main' && github.event_name == 'push' }} name: Maven SNAPSHOT Deploy runs-on: ubuntu-latest timeout-minutes: 30 diff --git a/scripts/jdbc_maven_deploy_snapshot.py b/scripts/jdbc_maven_deploy_snapshot.py index 1ad4b06ed..b20f2de40 100755 --- a/scripts/jdbc_maven_deploy_snapshot.py +++ b/scripts/jdbc_maven_deploy_snapshot.py @@ -68,9 +68,9 @@ def get_snapshot_version(): """ Calculate SNAPSHOT version from the last release tag and current commit. - DuckDB uses 4-part versioning (e.g., v1.4.4.0). We increment the third - component (patch) and reset the fourth to 0 for SNAPSHOTs. - Example: v1.4.4.0 + commit abc1234 -> 1.4.5.0-abc1234-SNAPSHOT + DuckDB uses 4-part versioning (e.g., v1.4.4.0). We increment the second + component (minor) and remove the third and fourth for SNAPSHOTs. + Example: v1.4.4.0 + commit abc1234 -> 1.5-abc1234-SNAPSHOT """ last_tag = run_cmd('git tag --sort=-committerdate').split('\n')[0] version_regex = re.compile(r'^v(\d+)\.(\d+)\.(\d+)\.(\d+)$') @@ -84,7 +84,7 @@ def get_snapshot_version(): # Get short commit hash for traceability commit_hash = run_cmd('git rev-parse --short HEAD') # Increment patch version and include commit hash - return f"{major}.{minor}.{patch + 1}.0-{commit_hash}-SNAPSHOT" + return f"{major}.{minor + 1}-{commit_hash}-SNAPSHOT" def create_settings_xml(settings_path):