Skip to content

Conversation

c-herrewijn
Copy link
Member

Set default value for MAIN_BRANCH_VERSIONING to false.
NOTE: needs to be reverted on main branch:

git revert 7cd2e2439017200753d120ec74b5575639b3844b

This PR is part of a 2 step code change:

  1. minor resturcture, no logical change (minor restructure MAIN_BRANCH_VERSIONING #17601)
  2. set default for MAIN_BRANCH_VERSIONING to false (revert on main branch) <----- this PR

@carlopi
Copy link
Contributor

carlopi commented May 22, 2025

This looks right, I will test it more properly and come back

Mytherin added a commit that referenced this pull request May 22, 2025
minor restructure, allows for easier adjustment of default for
MAIN_BRANCH_VERSIONING

This PR is part of a 2 step code change:
1. minor resturcture, no logical change <----- **this PR**
2. set default for MAIN_BRANCH_VERSIONING to false (revert on main
branch) #17602
Copy link
Contributor

@carlopi carlopi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Tested, works as intended

@carlopi
Copy link
Contributor

carlopi commented May 22, 2025

@Mytherin: this is good to go, and will make so that building v1.3-ossivalis branch will now get a version that looks like v1.3.1-devX.

What's next:

  1. merging this PR (now v1.3-ossivalis has the right version scheme, and main too)
  2. merging v1.3-ossivalis into main (then main will swap to the incorrect versioning scheme)
  3. Merge a PR like: git revert 7cd2e2439017200753d120ec74b5575639b3844b into main (so that main goes back again to use the v1.4.0-dev versioning scheme
  4. Re-enabling nightly CI, both for v1.3-ossivalis and main

Steps needs to happen in order, but lags in between are fine (no single atomic change :) )

@Mytherin Mytherin merged commit 97a49ec into duckdb:v1.3-ossivalis May 22, 2025
54 checks passed
@c-herrewijn c-herrewijn deleted the MAIN_BRANCH_VERSIONING-set-to-false branch May 26, 2025 10:27
@c-herrewijn
Copy link
Member Author

also added to release checklist:
https://github.com/duckdblabs/duckdb-internal/pull/4931/files

krlmlr added a commit to duckdb/duckdb-r that referenced this pull request Jun 2, 2025
Generate correct UUID v7 (duckdb/duckdb#17612)
Main branch versioning set to false (duckdb/duckdb#17602)
minor restructure MAIN_BRANCH_VERSIONING (duckdb/duckdb#17601)
[Dev][CLI] Use an unused bit for `DUCKDB_LATEST_STORAGE_VERSION` (duckdb/duckdb#17598)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants