From 01f18e2bbb7b2cf66452afb8a30bb3dbe6fed00e Mon Sep 17 00:00:00 2001
From: MxNxPx <MxNxPx@gmail.com>
Date: Mon, 22 Jan 2024 14:41:15 -0500
Subject: [PATCH 1/2] fix: release using updated version strategy

---
 .release-please-manifest.json |  2 +-
 bundle/uds-bundle.yaml        |  6 ++++--
 release-please-config.json    | 12 ++++++++----
 tasks/publish.yaml            |  2 +-
 version.txt                   |  2 +-
 zarf.yaml                     |  2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index ae02cafb..5d8003fa 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "16.5.1-3"
+    ".": "16.5.1-uds.4"
 }
diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml
index be1c397e..b38b9464 100644
--- a/bundle/uds-bundle.yaml
+++ b/bundle/uds-bundle.yaml
@@ -2,7 +2,9 @@ kind: UDSBundle
 metadata:
   name: gitlab-test
   description: A UDS bundle for deploying Gitlab and it's dependencies on a development cluster
-  version: 0.1.0
+  # x-release-please-start-version
+  version: 16.5.1-uds.4
+  # x-release-please-end
 
 packages:
   - name: gitlab-minio
@@ -20,5 +22,5 @@ packages:
   - name: gitlab
     path: ../
     # x-release-please-start-version
-    ref: 16.5.1-3
+    ref: 16.5.1-uds.4
     # x-release-please-end
diff --git a/release-please-config.json b/release-please-config.json
index 30bf5249..f6ba8517 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -1,20 +1,24 @@
 {
   "packages": {
     ".": {
-      "release-type": "simple",
-      "draft": false,
       "changelog-path": "CHANGELOG.md",
       "changelog-sections": [
         { "type": "feat", "section": "Features", "hidden": false },
         { "type": "fix", "section": "Bug Fixes", "hidden": false },
         { "type": "chore", "section": "Miscellaneous", "hidden": false }
       ],
+      "release-type": "simple",
+      "bump-minor-pre-major": true,
+      "bump-patch-for-minor-pre-major": true,
+      "draft": false,
       "versioning": "prerelease",
+      "prerelease-type": "uds",
       "extra-files": [
         "bundle/uds-bundle.yaml",
         "tasks/publish.yaml",
         "zarf.yaml"
       ]
     }
-  }
-}
+  },
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
+}
\ No newline at end of file
diff --git a/tasks/publish.yaml b/tasks/publish.yaml
index 43ec0a25..943717c8 100644
--- a/tasks/publish.yaml
+++ b/tasks/publish.yaml
@@ -5,7 +5,7 @@ variables:
   - name: VERSION
     description: The version of the package to build
     # x-release-please-start-version
-    default: "16.5.1-3"
+    default: "16.5.1-uds.4"
     # x-release-please-end
 
 tasks:
diff --git a/version.txt b/version.txt
index a7bea611..8f23d48a 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-16.5.1-3
+16.5.1-uds.4
diff --git a/zarf.yaml b/zarf.yaml
index c334d55b..3e44bdb9 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -4,7 +4,7 @@ metadata:
   name: gitlab
   description: "UDS GitLab Package"
   # x-release-please-start-version
-  version: "16.5.1-3"
+  version: "16.5.1-uds.4"
   # x-release-please-end
   architecture: amd64
 

From 9bf30abd824aad9300eeb3d7e81b32798626d76c Mon Sep 17 00:00:00 2001
From: MxNxPx <MxNxPx@gmail.com>
Date: Mon, 22 Jan 2024 15:40:02 -0500
Subject: [PATCH 2/2] chore: set correct version number before release

---
 .release-please-manifest.json | 2 +-
 bundle/uds-bundle.yaml        | 4 ++--
 tasks/publish.yaml            | 2 +-
 version.txt                   | 2 +-
 zarf.yaml                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 5d8003fa..c932292e 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "16.5.1-uds.4"
+    ".": "16.5.1-uds.3"
 }
diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml
index b38b9464..d4ef75a5 100644
--- a/bundle/uds-bundle.yaml
+++ b/bundle/uds-bundle.yaml
@@ -3,7 +3,7 @@ metadata:
   name: gitlab-test
   description: A UDS bundle for deploying Gitlab and it's dependencies on a development cluster
   # x-release-please-start-version
-  version: 16.5.1-uds.4
+  version: 16.5.1-uds.3
   # x-release-please-end
 
 packages:
@@ -22,5 +22,5 @@ packages:
   - name: gitlab
     path: ../
     # x-release-please-start-version
-    ref: 16.5.1-uds.4
+    ref: 16.5.1-uds.3
     # x-release-please-end
diff --git a/tasks/publish.yaml b/tasks/publish.yaml
index 943717c8..d2e83220 100644
--- a/tasks/publish.yaml
+++ b/tasks/publish.yaml
@@ -5,7 +5,7 @@ variables:
   - name: VERSION
     description: The version of the package to build
     # x-release-please-start-version
-    default: "16.5.1-uds.4"
+    default: "16.5.1-uds.3"
     # x-release-please-end
 
 tasks:
diff --git a/version.txt b/version.txt
index 8f23d48a..cc3b165d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-16.5.1-uds.4
+16.5.1-uds.3
diff --git a/zarf.yaml b/zarf.yaml
index 3e44bdb9..7d920a50 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -4,7 +4,7 @@ metadata:
   name: gitlab
   description: "UDS GitLab Package"
   # x-release-please-start-version
-  version: "16.5.1-uds.4"
+  version: "16.5.1-uds.3"
   # x-release-please-end
   architecture: amd64