From aaron at letsencrypt.org Wed Jul 14 15:57:48 2021 From: aaron at letsencrypt.org (Aaron Gable) Date: Wed, 14 Jul 2021 08:57:48 -0700 Subject: [Infrastructure] Draft minutes of meeting 2021-07-14 Message-ID: Infrastructure Subcommittee Minutes 2021-07-14 Attendees - Corey Bonnell - Shelley Brewer - Aaron Gable - Jos Purvis - Ryan Sleevi - Wayne Thayer - Ben Wilson Antitrust Statement - Read by Jos Purvis Agenda - Approving previous minutes - No previous minutes to approve? - Jos: Let?s catch up the wiki page with old minutes, then approve everything. - GitHub - Ryan: No new activity - Tagging - Ryan: Discussed with Jos using tagging to annotate semver versions of BRs/EVs/NSRs. Would make it easier to diff between versions of the documents, without having to figure out which commits correspond to which versions of the docs. - Aaron: Use slashes to delimit doc names from versions, e.g. `refs/tags/brs/v1.7.8` - Jos: Multiple tags? - Ryan: A single commit might have multiple tags, one for each document that it updates, and none for documents that are not updated. - Corey: What about having tags for the ?latest?? - Ryan: Rewriting tags is harder and messier than it looks. - Aaron: Rewriting tags violates various assumptions in the git and GitHub tools. What you actually want is `git symbolic-ref` but GitHub doesn?t have good support for that. - Jos: Historic spelunking for previous versions? - Ryan: Let?s only go back as far as when we made GitHub canonical (the pandoc conversion). - Branches - Jos: I?ve been leaving branches in place, rather than immediately deleting them after merging. How do folks feel about that? - Aaron: GitHub keeps inaccessible objects around for a surprisingly long time, so you can still fetch them if you know the SHA1. - Ryan: Yeah, we don?t really need the branches; small mistakes can be corrected with follow-up Pull Requests. - Jos: For now, I?ll leave them up for a week and then delete, and at some point in the future we can switch to autodelete. - Simultaneous ballots touching nearby sections - Ryan: Create the second branch based off of the first branch, rather than based off of main. - Aaron: GitHub will update the base branch automatically. - Jos: This most recent time, I opened both as merges against main. After merging SC45, I just had to go into SC46 and fix the one merge conflict in the version number, but that worked because they weren?t touching the same sections. Concern with stacking: if the first change gets stuck in IPR, then you have to disentangle them. - Ryan: Notably, using the stacked approach means that the PDF redline of the latter change will incorporate the prior change as part of its baseline. - Aaron: If you really have to disentangle stacked changes, you can get a local checkout and use `git rebase --onto` and `git push --force` to separate them. It?s a bit messy, but it?s reliable and should only be necessary in corner cases. - Jos: I?ll document both the mainline process and the exceptional process, and folks can double-check that. - Aaron: How do we make sure that this whole process ends up with a commit which exactly (modulo chair discretion like version number) matches the original email diff ballot? - Ryan: The ballots contain a github diff which can be converted to a patchfile and applied directly, and we can use that to double-check that the PR did the right thing. - Jos: I?ve been generating IPR redlines using Word and Acrobat because the ones generated by the automated tooling aren?t very good. - Ryan: Oops, but not surprising, given that the tooling is perl scripts lexing LaTeX. Go ahead and file tickets against the tools repo, and if we can?t resolve that then we?ll remove that piece of automation and provide better instructions instead. Meeting adjourned until 2021-07-28 -------------- next part -------------- An HTML attachment was scrubbed... URL: From dzacharo at harica.gr Wed Jul 28 15:37:11 2021 From: dzacharo at harica.gr (Dimitris Zacharopoulos (HARICA)) Date: Wed, 28 Jul 2021 18:37:11 +0300 Subject: [Infrastructure] Minutes of meeting@2021-07-28 Message-ID: <8b9eb469-cd44-2d81-a0c7-b9fd948a0d7e@harica.gr> I added the draft minutes at https://wiki.cabforum.org/infra/mtg_20210728. Ryan, in case I missed or incorrectly captured some of the details you mentioned about version tagging, please update that section. Thanks, Dimitris.