Skip to content
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

Revert "I am preparing a point release for next week, fixes and small… #5174

Merged
merged 1 commit into from
Jun 6, 2022

Conversation

kmk3
Copy link
Collaborator

@kmk3 kmk3 commented Jun 4, 2022

… number of new features. Check in everything you have out."

This reverts commit e8cb03c.

More specifically: s/0.9.68.1/0.9.69/.

The current development version contains not only new features, but also
breaking changes (see "modif:" on the RELNOTES). Ensure at least a
minor (rather than only a patch) version bump (to 0.9.70 on the final
version) to avoid breaking user expectations.

… number of new features. Check in everything you have out."

This reverts commit e8cb03c.

More specifically: s/0.9.68.1/0.9.69/.

The current development version contains not only new features, but also
breaking changes (see "modif:" on the RELNOTES).  Ensure at least a
minor (rather than only a patch) version bump (to 0.9.70 on the final
version) to avoid breaking user expectations.
@kmk3 kmk3 requested a review from netblue30 June 4, 2022 23:57
@kmk3
Copy link
Collaborator Author

kmk3 commented Jun 5, 2022

Numbering changes aside, if it is desired to make a release based on just
0.9.68 plus some fixes (which is what I would think of when seeing a version
like 0.9.68.1), that might also be doable (depending on what has to be
backported).

It could probably be done in the same way as in the other series that contain
bugfix releases:

Recent bugfix releases

$ git branch --list -r -- 'origin/*0.*'
  origin/release-0.9.62
  origin/release-0.9.64
$ git tag -l -- '0.9.6?.*'
0.9.62.2
0.9.62.4
0.9.64.2
0.9.64.4
$ git log --decorate --oneline -n 15 0.9.62..origin/release-0.9.62
77de044d8 (tag: 0.9.62.4, origin/release-0.9.62) release 0.9.62.4
2738ea2aa shutdown option hidepid fix
8263c4703 Merge branch 'release-0.9.62' of https://github.com/netblue30/firejail into release-0.9.62
ed26a0fa7 AppArmor fix
51ba949ab tests: fix check for modules directory
018a2f589 tests: fix rlimit test for 32bit archs
186b064d1 print errno if char device creation fails
1eb8418af tests: fix false-positive match on modules
69d54f715 import teams profile
ea619c3ce add element profile
45f14b88e (tag: 0.9.62.2) Fix date
66a0f7288 clean make cppcheck
dad6eda04 Merge branch 'release-0.9.62' of https://github.com/netblue30/firejail into release-0.9.62
89accfbe0 fix writable-var-log
9858975f9 profile fixes (3)

That is, by creating a branch from 0.9.68:

git checkout 0.9.68
git branch release-0.9.68
git push -u

Then copying over each bugfix (using git cherry-pick -x where it can be
helped).

With a list of what exactly is intended to be copied over, I could try making
such a branch myself if you want.

Misc: Considering how long normal firejail releases usually take, having bugfix
releases in between them could help in getting important bugfixes out faster.

@netblue30
Copy link
Owner

netblue30 commented Jun 6, 2022

OK, let's go with a full release (0.9.70). Thanks! Also, will use make deb-apparmor.

@netblue30 netblue30 merged commit 5b4593f into netblue30:master Jun 6, 2022
@kmk3 kmk3 deleted the revert-release-version branch June 6, 2022 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done (RELNOTES N/A)
Development

Successfully merging this pull request may close these issues.

2 participants