From b518fd1263048fc523bfafea4443733f959adaad Mon Sep 17 00:00:00 2001
From: Actaeus Curabitur <actcur@actcur.com>
Date: Thu, 8 Sep 2022 06:31:27 -0500
Subject: [PATCH] rename merge to squash and update branch names

---
 merge.sh => squash.sh | 12 ++++++------
 states/test           | 18 ++++++++++++++++++
 states/test.sls       |  4 ++++
 3 files changed, 28 insertions(+), 6 deletions(-)
 rename merge.sh => squash.sh (61%)
 create mode 100644 states/test
 create mode 100644 states/test.sls

diff --git a/merge.sh b/squash.sh
similarity index 61%
rename from merge.sh
rename to squash.sh
index 62b3b5a..51c9d09 100644
--- a/merge.sh
+++ b/squash.sh
@@ -3,17 +3,17 @@ git fetch --all;
 
 #copy dev to history to ensure we don't lose changes if something goes wrong
 git checkout history;
-git reset --hard dev;
+git reset --hard qual;
 git push --force;
 
 #merge to master
-git checkout -B master origin/master;
-git merge --squash dev;
+git checkout -B prod origin/master;
+git merge --squash qual;
 git commit -am "$cm";
 git push;
 
 #clean dev
-git checkout dev;
-git reset --hard master;
+git checkout qual;
+git reset --hard prod;
 git push --force;
-git reset --hard origin/dev;
+git reset --hard origin/qual;
diff --git a/states/test b/states/test
new file mode 100644
index 0000000..89ca9da
--- /dev/null
+++ b/states/test
@@ -0,0 +1,18 @@
+{%- set branches=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split('\n') -%}
+branches:
+  saltmaster:
+{%- for branch in branches %}
+    - {{branch}}
+{%- endfor %}
+
+git:
+{%- for branch in branches %}
+  salt_{{branch}}:
+    repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
+    path: "/srv/salt/{{branch}}"
+    branch: "{{branch}}"
+    key: "git_actcur"
+    force: {{ "True" if branch == "prod" else "false" }}
+    email: "actcur@actcur.com"
+    name: "Actaeus Curabitur"
+{%- endfor %}
diff --git a/states/test.sls b/states/test.sls
new file mode 100644
index 0000000..e7db26e
--- /dev/null
+++ b/states/test.sls
@@ -0,0 +1,4 @@
+/test:
+  file.managed:
+    - source: salt://test
+    - template: jinja