Merge pull request #553 from mallardduck/prepare-for-main

Prepare BRO for new branching

.github/renovate.json

@@ -4,6 +4,7 @@
     "group:allNonMajor"
   ],
   "baseBranches": [
+    "main",
     "release/v3.0",
     "release/v4.0",
     "release/v5.0"

.github/workflows/ci.yaml

@@ -7,6 +7,7 @@ on:
   workflow_call:
   push:
     branches:
+      - main
       - release/v5.0
       - release/v4.0
       - release/v3.0

.github/workflows/publish.yaml

@@ -2,6 +2,8 @@ name : Publish Images & artifacts (via goreleaser)
 
 on:
   push:
+    branches:
+      - main
     tags:
       - "*"
 
@@ -67,15 +69,11 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ env.DOCKER_USERNAME }}
           password: ${{ env.DOCKER_PASSWORD }}
-        # setup tag name
-      - if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        run: |
-          echo TAG_NAME=$(echo $GITHUB_REF | sed -e "s|refs/tags/||") >> $GITHUB_ENV
       - name: Build and push BRO image
         uses: docker/build-push-action@v6
         with:
           context: .
           file: ./package/Dockerfile
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.REPO }}/backup-restore-operator:${{ env.TAG_NAME }}
+          tags: ${{ env.REGISTRY }}/${{ env.REPO }}/backup-restore-operator:${{ github.ref == 'refs/heads/main' && 'head' || github.ref_name }}
           platforms: linux/amd64,linux/arm64

README.md

@@ -20,10 +20,15 @@ What the Backup Restore Operator is not:
 - Configured to back up user-created resources on the Rancher cluster.
 
 ### Branches and Releases
+This is the current branch strategy for `rancher/backup-restore-operator`, it may change in the future.
+
+| Branch         | Tag      | Rancher                |
+|----------------|----------|------------------------|
+| `main`         | `head`   | `main` branch (`head`) |
+| `release/v5.0` | `v5.x.x` | `v2.9.x`               |
+| `release/v4.0` | `v4.x.x` | `v2.8.x`               |
+| `release/v3.0` | `v3.x.x` | `v2.7.x`               |
 
-*  the tag `v5.x.x` is cut from the `release/v5.0` branch for the Rancher v2.9.x line
-*  the tag `v4.x.x` is cut from the `release/v4.0` branch for the Rancher v2.8.x line
-*  the tag `v3.x.x` is cut from the `release/v3.0` branch for the Rancher v2.7.x line
 ----
 
 ## Quickstart