From 9ba8c8f829e953445ea21f5a3fbf6c8d7947f311 Mon Sep 17 00:00:00 2001
From: James Andariese <james@strudelline.net>
Date: Thu, 28 Mar 2024 22:03:43 -0500
Subject: [PATCH] change to k-branches

the history changing on every commit felt very yucky.
---
 .github/workflows/build.yaml | 7 ++++++-
 k/flux.yaml                  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fea9260..c10a9fe 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -21,9 +21,14 @@ jobs:
             docker tag "`cat iid.txt`" "$DOCKER_REGISTRY/$GITHUB_REPOSITORY:$TAG"
             docker push "$DOCKER_REGISTRY/$GITHUB_REPOSITORY:$TAG"
           done
+          git checkout -B k-$GITHUB_REF_NAME
+          git checkout $GITHUB_REF_NAME
+          git branch -D k-$GITHUB_REF_NAME
+          git checkout -b k-$GITHUB_REF_NAME
           sed -i -e "s@image: $DOCKER_REGISTRY/$GITHUB_REPOSITORY:.*@image: $DOCKER_REGISTRY/$GITHUB_REPOSITORY:$STAG@" k/runner.yaml
+          sed -i -e "s@branch: .*@k-$GITHUB_REF_NAME@" k/flux.yaml
           git config user.name "$GITHUB_REPOSITORY (act)"
           git config user.email "gitea-actions@strudelline.net"
           git add k/runner.yaml
           git commit -m "upgrade runner sts to $STAG"
-          git push
+          git push -f origin k-$GITHUB_REF_NAME
diff --git a/k/flux.yaml b/k/flux.yaml
index 80d1ce0..1065c94 100644
--- a/k/flux.yaml
+++ b/k/flux.yaml
@@ -8,7 +8,7 @@ spec:
   interval: 5m
   url: https://git.strudelline.net/cascade/docker-act_runner
   ref:
-    branch: main
+    branch: k-main
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization