From ed2cc49eebc36c7a1f8179259d65ec40ce968381 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Mon, 28 Aug 2023 15:18:46 +0200 Subject: [PATCH 1/5] Fix localization branch name in branching docs The localization branch is called f, not fedora-. --- docs/release.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/release.rst b/docs/release.rst index 237f6f3c468..c09aa6c2095 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -246,13 +246,13 @@ Create a new localization directory from ``master`` directory: :: - cp -r master fedora- + cp -r master f Add the new folder to git: :: - git add fedora- + git add f Commit these changes: From c08880f2c0d1011cd97027e90a3c9c03122e9dab Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Mon, 28 Aug 2023 16:14:19 +0200 Subject: [PATCH 2/5] Fix Cockpit CI docs for branching Looks like the _manual bit is not there anymore. --- docs/release.rst | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/docs/release.rst b/docs/release.rst index c09aa6c2095..ca2870c95e6 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -271,21 +271,9 @@ Enable Cockpit CI for the new branch ------------------------------------------- Anaconda is using the Cockpit CI infrastructure to run Web UI test. Cockpit CI tests are triggered -automatically for all `listed `_ projects and per-project branches. To enable Cockpit CI in automatic mode for the new Fedora branch, our new fedora- upstream branch needs to be added under the 'rhinstaller/anaconda' key in the file. The end result could look like this: +automatically for all `listed `_ projects and per-project branches. To enable Cockpit CI in automatic mode for the new Fedora branch, our new fedora- upstream branch needs to be added under the 'rhinstaller/anaconda' key in the file. See the previous PR (for F39) to see how this is to be done: -:: - 'rhinstaller/anaconda': { - 'master': [ - 'fedora-35/rawhide', - ], - 'fedora-38': [ - 'fedora-38', - ], - '_manual': [ - ] - }, - -Just fork the repo `cockpit-project repo `_ and submit the change to ``lib/testmap.py`` as a PR. In case something is not clear (such as what are the valid target strings - fedora-35/rawhide, fedora-36, etc.) reach out to the #cockpit IRC channel on libera.chat. +https://github.com/cockpit-project/bots/pull/5176 How to branch Anaconda ---------------------- From 4bc168b3ab19ccb0ce44289b462af4e2e05f04b3 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Mon, 28 Aug 2023 20:07:53 +0200 Subject: [PATCH 3/5] Document the need for changing the l10n commit hash While this is usually automated, it needs to be done manually right after branching. --- docs/release.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/release.rst b/docs/release.rst index ca2870c95e6..7dd0f0cc4ff 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -304,6 +304,12 @@ Then rebuild everything that is templatized: This should set up infrastructure and some other parts like makefile variables and pykickstart version used. +Lastly it is necessary to set up updated l10n commit hash - check the commit hash of the ``anaconda-l10n`` repo, +the one where the new f folder has been added and put the hash to the ``GIT_L10N_SHA`` variable in the +``po/l10n-config.mk`` file. + +This is necessary for the Web UI related translation pinning to work & l10n branching checks to pass. + Verify the changes and commit: :: From b1237ee37111d1709548c3c5c26b1d20e0a0e310 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Mon, 28 Aug 2023 20:10:15 +0200 Subject: [PATCH 4/5] Note to push to master branch after updating Rawhide config This should make it harder to forget to do that. --- docs/release.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/release.rst b/docs/release.rst index 7dd0f0cc4ff..5731732da0b 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -354,6 +354,12 @@ Expect changes only in Github workflows that generate containers etc. for multip make -f Makefile.am reload-infra git commit -a -m "infra: Configure for the new fedora-NN branch" +Then, finally, push the updated master branch: + +:: + + git push origin master + How to add release version for next Fedora ------------------------------------------ From aba6a3aa313ac813a992af64e6d73bd395c4da3a Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Mon, 28 Aug 2023 20:13:57 +0200 Subject: [PATCH 5/5] Add a note about the need to rebuild containers after branching In the future it would be best to either automatically trigger the rebuild or extend this section with instructions about how to perform the procedure or at least information which containers should be rebuilt. --- docs/release.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/release.rst b/docs/release.rst index 5731732da0b..6cf1f8f5952 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -360,6 +360,13 @@ Then, finally, push the updated master branch: git push origin master +Container rebuilds after branching +---------------------------------- + +Container rebuilds currently do not happen automatically after branching. So do not forget to rebuild +all relevant containers after Fedora branching. + + How to add release version for next Fedora ------------------------------------------