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

nixos manual: releases workflow improvements #45957

Merged
merged 4 commits into from Nov 20, 2019
Merged

nixos manual: releases workflow improvements #45957

merged 4 commits into from Nov 20, 2019

Conversation

@vcunat
Copy link
Member

vcunat commented Sep 2, 2018

  • git push --tags is too dangerous (pushes all your tags)
@vcunat vcunat added this to the 18.09 milestone Sep 2, 2018
@vcunat

This comment has been minimized.

Copy link
Member Author

vcunat commented Sep 2, 2018

/cc @samueldr. I imagine we'll gather our experience here. Probably no need to rush with merging.

@samueldr

This comment has been minimized.

Copy link
Member

samueldr commented Sep 2, 2018

I would use git checkout -b release-17.09 instead of -B. as following the advice in e.g. a sleep-deprived state of mind, could replace the branch locally! (Minor headache as it should be a protected branch.)

Let's keep this open for other gotchas and improvements.

@vcunat

This comment has been minimized.

Copy link
Member Author

vcunat commented Sep 2, 2018

👍 I didn't even remember there was a -B variant of the command. It seems I didn't read this properly half a year ago.

@samueldr

This comment has been minimized.

Copy link
Member

samueldr commented Sep 2, 2018

  • Update versionSuffix in nixos/release.nix, use git log --format=%an|wc -l to get the commit count

This seemingly isn't done anymore.

@samueldr

This comment has been minimized.

Copy link
Member

samueldr commented Sep 2, 2018

[17:06:20] <gchristensen> ^ should expand the docs to include nixpkgs-N-darwin
@vcunat

This comment has been minimized.

Copy link
Member Author

vcunat commented Sep 2, 2018

This seemingly isn't done anymore.

I did it on the master branch apparently 🤔 7e968a4#diff-831e8d9748240fb23e6734fdc2a6d16eR1

At the very least, the instructions should be clearer about which branch should take which of the changes.

@samueldr

This comment has been minimized.

Copy link
Member

samueldr commented Sep 2, 2018

@samueldr

This comment has been minimized.

Copy link
Member

samueldr commented Sep 2, 2018

I'm thinking this should probably be scripted, at least the repository manipulation + local updates. (I'll think about it more and look into it later.)

@vcunat

This comment has been minimized.

Copy link
Member Author

vcunat commented Sep 6, 2018

vcunat and others added 2 commits Sep 2, 2018
- `git push --tags` is too dangerous (pushes all your tags)
@samueldr samueldr force-pushed the release-docs branch from 5f942e2 to 4f43e5f Oct 5, 2018
@samueldr

This comment has been minimized.

Copy link
Member

samueldr commented Oct 5, 2018

Added some notes; we're left with "what's up with versionSuffix", mainly.

Don't forget to squash before merging please :)

@samueldr

This comment has been minimized.

Copy link
Member

samueldr commented Oct 15, 2018

See #48222 → AMIs (and possibly other out-of-hydra artifacts?)

@vcunat

This comment has been minimized.

Copy link
Member Author

vcunat commented Oct 16, 2018

Eh, so the instruction would be to ping Eelco about the AMIs? :-) @edolstra: can we do better to offload that from you? I don't know what's required to add them.

@samueldr

This comment has been minimized.

Copy link
Member

samueldr commented Nov 11, 2018

We might want, in the next releases, to also link to the announcement on the discourse.

@vcunat

This comment has been minimized.

Copy link
Member Author

vcunat commented Nov 11, 2018

I think we want all "longer-term important" information to be in the release notes themselves, and the discourse post is mainly a link to the notes with discussion around. In this particular case, we do have the support of 18.03 in its release notes (on a prominent place).

I'm not against linking to the discourse thread back from the release notes as well, but there's a circular dependency :-) We can add the links even now, retrospectively.

@zimbatm

This comment has been minimized.

Copy link
Member

zimbatm commented Nov 14, 2018

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/upload-recent-images-to-gs-nixos-images/1435/5

1 similar comment
@zimbatm

This comment has been minimized.

Copy link
Member

zimbatm commented Nov 14, 2018

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/upload-recent-images-to-gs-nixos-images/1435/5

@zimbatm

This comment has been minimized.

Copy link
Member

zimbatm commented Nov 14, 2018

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/discourse-github-integration/1438/2

@samueldr

This comment has been minimized.

Copy link
Member

samueldr commented Nov 16, 2018

#48588 changes the location of the codename.

(Still tracking things to update, let's review and write by mid-january I guess)

@vcunat

This comment has been minimized.

Copy link
Member Author

vcunat commented Nov 18, 2018

  • ping @rbvermaa about gs://nixos-cloud-images. (Noone else who can do it is known to me ATM.)
@vcunat

This comment has been minimized.

Copy link
Member Author

vcunat commented Feb 27, 2019

Oops, we should have finished this earlier. /cc @lheckemann in case you don't know about this WIP.

@zimbatm

This comment has been minimized.

Copy link
Member

zimbatm commented Mar 4, 2019

can we merge this as it's already an improvement?

@matthewbauer matthewbauer modified the milestones: 18.09, 19.09 Apr 5, 2019
It's been a very long time, so I think a merge will be better than
a rebase.  There was only one simple conflict.
@vcunat vcunat changed the title [WIP] nixos manual: releases workflow improvements nixos manual: releases workflow improvements Oct 27, 2019
@vcunat

This comment has been minimized.

Copy link
Member Author

vcunat commented Oct 27, 2019

Solved a simple conflict, and the diff seems to make sense to me. @disassembler, @lheckemann: can you have a look if the changes match your "experience"? /cc @asymmetric (hackday topic)

nixos/doc/manual/development/releases.xml Outdated Show resolved Hide resolved
nixos/doc/manual/development/releases.xml Outdated Show resolved Hide resolved
nixos/doc/manual/development/releases.xml Outdated Show resolved Hide resolved
Co-Authored-By: asymmetric <lorenzo@mailbox.org>
vcunat added a commit that referenced this pull request Nov 20, 2019
Let's merge NOW; I'm not doing the same mistake again.
vcunat added a commit that referenced this pull request Nov 20, 2019
Let's merge NOW; I'm not doing the same mistake again.

(cherry picked from commit e32d557)
@vcunat vcunat merged commit be6e0bf into master Nov 20, 2019
1 check was pending
1 check was pending
grahamcofborg-eval Checking new out paths
Details
@grahamc grahamc deleted the release-docs branch Dec 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

8 participants
You can’t perform that action at this time.