From a03f4c557c33addc08f09ac272138bb6e1918556 Mon Sep 17 00:00:00 2001
From: Jacob Fielding <jf0517@gmail.com>
Date: Wed, 7 Feb 2024 19:36:10 -0800
Subject: [PATCH 1/3] Added release ci for auto on main, manual otheriwsE

---
 .github/workflows/release_manual.yml  | 23 +++++++++++++++++++++++
 .github/workflows/release_on_push.yml | 16 ++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 .github/workflows/release_manual.yml
 create mode 100644 .github/workflows/release_on_push.yml

diff --git a/.github/workflows/release_manual.yml b/.github/workflows/release_manual.yml
new file mode 100644
index 0000000..9f04780
--- /dev/null
+++ b/.github/workflows/release_manual.yml
@@ -0,0 +1,23 @@
+name: Release Maplibre-SwiftUI Manually
+
+on:
+  workflow_dispatch:
+    inputs:
+      bump_version_scheme:
+        description: 'Bump version scheme'
+        required: true
+        default: 'patch'
+        options:
+        - 'patch'
+        - 'minor'
+        - 'major'
+
+jobs:
+  release-on-push:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: rymndhng/release-on-push-action@master
+        with:
+          bump_version_scheme: ${{ inputs.bump_version_scheme }}
\ No newline at end of file
diff --git a/.github/workflows/release_on_push.yml b/.github/workflows/release_on_push.yml
new file mode 100644
index 0000000..1bd6fde
--- /dev/null
+++ b/.github/workflows/release_on_push.yml
@@ -0,0 +1,16 @@
+name: Release Maplibre-SwiftUI on Main Auto
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release-on-push:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: rymndhng/release-on-push-action@master
+        with:
+          bump_version_scheme: 'patch'
\ No newline at end of file

From 253e62b1be220717af518076404c52f23719f4eb Mon Sep 17 00:00:00 2001
From: Jacob Fielding <jf0517@gmail.com>
Date: Fri, 9 Feb 2024 07:03:09 -0800
Subject: [PATCH 2/3] Added consolidated release workflow

---
 .../{release_manual.yml => release.yml}          |  8 ++++++--
 .github/workflows/release_on_push.yml            | 16 ----------------
 2 files changed, 6 insertions(+), 18 deletions(-)
 rename .github/workflows/{release_manual.yml => release.yml} (64%)
 delete mode 100644 .github/workflows/release_on_push.yml

diff --git a/.github/workflows/release_manual.yml b/.github/workflows/release.yml
similarity index 64%
rename from .github/workflows/release_manual.yml
rename to .github/workflows/release.yml
index 9f04780..5448d44 100644
--- a/.github/workflows/release_manual.yml
+++ b/.github/workflows/release.yml
@@ -1,9 +1,13 @@
-name: Release Maplibre-SwiftUI Manually
+name: Release Maplibre-SwiftUI
 
 on:
+  push:
+    branches:
+      - main
   workflow_dispatch:
     inputs:
       bump_version_scheme:
+        type: choice
         description: 'Bump version scheme'
         required: true
         default: 'patch'
@@ -20,4 +24,4 @@ jobs:
     steps:
       - uses: rymndhng/release-on-push-action@master
         with:
-          bump_version_scheme: ${{ inputs.bump_version_scheme }}
\ No newline at end of file
+          bump_version_scheme: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && 'patch' || inputs.bump_version_scheme }}
\ No newline at end of file
diff --git a/.github/workflows/release_on_push.yml b/.github/workflows/release_on_push.yml
deleted file mode 100644
index 1bd6fde..0000000
--- a/.github/workflows/release_on_push.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Release Maplibre-SwiftUI on Main Auto
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  release-on-push:
-    runs-on: ubuntu-latest
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: rymndhng/release-on-push-action@master
-        with:
-          bump_version_scheme: 'patch'
\ No newline at end of file

From 0f4d5e87bc92b5ebfe07eeff5375fe06f155c9b0 Mon Sep 17 00:00:00 2001
From: Jacob Fielding <jf0517@gmail.com>
Date: Fri, 9 Feb 2024 07:06:36 -0800
Subject: [PATCH 3/3] Added consolidated release workflow

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 769cf58..b810ec5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,7 +2,7 @@ name: Test maplibre-swiftui-dsl-playground
 
 on:
   push:
-    branches: [ main ]
+    branches: [ "*" ]
   pull_request:
     branches: [ main ]