Simplify the new release branching process

README.md

@@ -220,26 +220,16 @@ Make a PR similar to
 [ansible#1318](https://pagure.io/fedora-infra/ansible/pull-request/1318) in
 [fedora-infra/ansible](https://pagure.io/fedora-infra/ansible).
 
-### On Rawhide / main branch
+### This repo
+
+Use the branch recipe to create the new release branch and update the main
+branch:
 
 ```
-sed -i "s/45/46/g" *.repo comps-sync.py
-sed -i "s/releasever: 45/releasever: 46/" common.yaml
-sed -i --follow-symlinks "s/# - fedora-45/# - fedora-46/" *.yaml
-mv fedora-45.repo fedora-46.repo
-mv fedora-45-updates.repo fedora-46-updates.repo
-sed -i "s/46/46/g" README.md
-sed -i "s/45/46/g" README.md
+just branch <release>
 ```
 
-### On the new branch (f45)
-
-```
-rm fedora-rawhide.repo
-sed -i --follow-symlinks "/- fedora-rawhide/d" *.yaml
-sed -i --follow-symlinks "s/# - fedora-45/- fedora-45/" *.yaml
-sed -i "s/releasever_ref: \"rawhide\"/releasever_ref: \"45\"/" common.yaml
-```
+Push the new changes in both branches.
 
 ## Historical references
 

base-atomic.yaml

@@ -21,5 +21,5 @@ exclude-packages:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

budgie-atomic-ostree.yaml

@@ -7,5 +7,5 @@ include:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

budgie-atomic.yaml

@@ -4,5 +4,5 @@ include:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

cosmic-atomic-ostree.yaml

@@ -7,5 +7,5 @@ include:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

cosmic-atomic.yaml

@@ -4,5 +4,5 @@ include:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

fedora-45-updates.repo

@@ -1,6 +0,0 @@
-[fedora-45-updates]
-name=Fedora 45 $basearch Updates
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f45&arch=$basearch
-enabled=1
-gpgcheck=1
-metadata_expire=1d

fedora-45.repo

@@ -1,6 +0,0 @@
-[fedora-45]
-name=Fedora 45 $basearch
-mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-45&arch=$basearch
-enabled=1
-gpgcheck=1
-metadata_expire=1d

fedora.repo

@@ -0,0 +1,6 @@
+[fedora]
+name=Fedora $releasever $basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+enabled=1
+gpgcheck=1
+metadata_expire=1d

justfile

@@ -70,6 +70,25 @@ all: validate
 validate:
     ./ci/validate
 
+branch release:
+    git checkout main
+    # exit if branching the repo fails, possibly already exists
+    git branch f{{release}} || exit 1
+    sed -i "s/{{release}}/$(( {{release}} + 1 ))/g" comps-sync.py README.md
+    sed -i "s/releasever: {{release}}/releasever: $(( {{release}} + 1 ))/" common.yaml
+    git add comps-sync.py common.yaml README.md
+    git commit -m "Update main branch to $(( {{release}} + 1 ))"
+
+    git checkout f{{release}}
+    git rm fedora-rawhide.repo
+    sed -i --follow-symlinks "/- fedora-rawhide/d" *.yaml
+    sed -i --follow-symlinks "s/# - fedora/- fedora/" *.yaml
+    sed -i --follow-symlinks "s/# - updates/- updates/" *.yaml
+    sed -i "s/releasever_ref: \"rawhide\"/releasever_ref: \"{{release}}\"/" common.yaml
+    git add *.yaml
+    git commit -m "Update configs for branch f{{release}}"
+
+
 # Comps-sync, but without pulling latest
 sync:
     #!/bin/bash

kinoite-mobile.yaml

@@ -4,5 +4,5 @@ include:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

kinoite-ostree.yaml

@@ -7,5 +7,5 @@ include:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

kinoite.yaml

@@ -4,5 +4,5 @@ include:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

silverblue-ostree.yaml

@@ -7,5 +7,5 @@ include:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

silverblue.yaml

@@ -4,5 +4,5 @@ include:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

sway-atomic-ostree.yaml

@@ -7,5 +7,5 @@ include:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

sway-atomic.yaml

@@ -4,5 +4,5 @@ include:
 # Kept in the leaf manifest as they are overwritten by Pungi in composes
 repos:
   - fedora-rawhide
-  # - fedora-45
-  # - fedora-45-updates
+  # - fedora
+  # - updates

updates.repo

@@ -0,0 +1,6 @@
+[updates]
+name=Fedora $releasever $basearch Updates
+metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+enabled=1
+gpgcheck=1
+metadata_expire=1d