Skip to content

Bump version in version.txt [1.0] #1883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 20, 2025

Conversation

eric-maynard
Copy link
Contributor

With the 1.0 release branch being cut, we should bump this to reflect the current state of main

Copy link
Member

@snazy snazy left a comment

Choose a reason for hiding this comment

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

Let's not use the 1.0.x branch. It's not the branch that's documented in the release guide on the web site.

@eric-maynard
Copy link
Contributor Author

@snazy I understood that the branch was going to be renamed, are you suggesting that we instead cut a new branch from the tip of main?

version.txt Outdated
@@ -1 +1 @@
0.11.0-beta-incubating-SNAPSHOT
1.0.0-incubating-SNAPSHOT
Copy link
Member

Choose a reason for hiding this comment

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

Sorry, I wasn't clear in my previous comment.

On release branch, it's not a SNAPSHOT, it's a release, so 1.0.0-incubating.

Copy link
Member

Choose a reason for hiding this comment

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

Well, nope. On a tag it's a release version - but not in a branch.

Copy link
Member

Choose a reason for hiding this comment

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

(Otherwise you get a non-reproducible build)

Copy link
Contributor Author

@eric-maynard eric-maynard Jun 12, 2025

Choose a reason for hiding this comment

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

Based on the other branches it looks like it should have no SNAPSHOT but let me know if this does need to change back

@snazy
Copy link
Member

snazy commented Jun 12, 2025

@snazy I understood that the branch was going to be renamed, are you suggesting that we instead cut a new branch from the tip of main?

Yep (probably quicker than tweaking an existing PR).

@eric-maynard
Copy link
Contributor Author

eric-maynard commented Jun 12, 2025

@snazy I'll leave the question of rename vs. new cut to the release manager; my (incorrect?) assumption was that once we've picked a commit to release from we'd prefer not to change that lightly. If we end up closing the target branch here we can cherry pick this onto the new branch 👍

@snazy
Copy link
Member

snazy commented Jun 12, 2025

@snazy I'll leave the question of rename vs. new cut to the release manager; my (incorrect?) assumption was that once we've picked a commit to release from we'd prefer not to change that lightly. If we end up closing the target branch here we can cherry pick this onto the new branch 👍

Yea - cherry-picking on the new branch is fine for me. I'd be very careful with removing the -SNAPSHOT suffix in a Git branch - there can be unforeseen consequences.

BTW, if you're interested: Some technical background on semi-automatic releases is here. There are quite some annoying things for releases that can go wrong - most annoying is "concurrent merges/commits" that do happen in real life.

@eric-maynard eric-maynard changed the base branch from 1.0.x to release/1.0.x June 12, 2025 17:46
@eric-maynard
Copy link
Contributor Author

Just changed the target to the new branch release/1.0.x -- thanks guys!

@dimas-b
Copy link
Contributor

dimas-b commented Jun 13, 2025

I do not think the scope for 1.0 is completely set per dev email thread: https://lists.apache.org/thread/g1m3nj9g7jnrvkd9ogq6h3v4cmll5lwo

Let's hold version updates until we have consensus there.

@eric-maynard eric-maynard requested a review from snazy June 20, 2025 15:01
@eric-maynard
Copy link
Contributor Author

@dimas-b I have only been loosely following that thread, but it looks like we may be all set now?

@dimas-b
Copy link
Contributor

dimas-b commented Jun 20, 2025

The question of re-branching from main has been settled, indeed, so I'm ok with merging this PR. No re-branching per: https://lists.apache.org/thread/m4lfwo9lkwjj8gjhqm8no5nhlnd2cdhq

Re: scope, let's use that dev ML thread for any follow-up items.

@flyrain flyrain merged commit 566379d into apache:release/1.0.x Jun 20, 2025
2 checks passed
@github-project-automation github-project-automation bot moved this from PRs In Progress to Done in Basic Kanban Board Jun 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants