From 27dd530dbe5ad2c8db82d7f35922961d5c95a31c Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Fri, 31 May 2024 00:51:58 -0500
Subject: [PATCH] GH Actions nonsense

---
 .github/workflows/release-create.yml | 47 +++++++++++++++-------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/release-create.yml b/.github/workflows/release-create.yml
index d169bb8b..6bcd2568 100644
--- a/.github/workflows/release-create.yml
+++ b/.github/workflows/release-create.yml
@@ -2,24 +2,17 @@
 name: ⏱️Test/🔨Build/🚀Deploy
 
 # fire on
-on: [
-  push,
-  pull_request
-]
-
-# on:
-#   push:
-#     branches:
-#       - DoorDevUnstable
-#       - DoorDev
-#       - OverworldShuffleDev
-#       - OverworldShuffle
-#   pull_request:
-#     branches:
-#       - DoorDevUnstable
-#       - DoorDev
-#       - OverworldShuffleDev
-#       - OverworldShuffle
+on:
+  push:
+    branches:
+      # - DoorDevUnstable
+      # - DoorDev
+      - OverworldShuffle
+  pull_request:
+    branches:
+      # - DoorDevUnstable
+      # - DoorDev
+      - OverworldShuffle
 
 # stuff to do
 jobs:
@@ -369,7 +362,7 @@ jobs:
           release_name: ${{ steps.debug_info.outputs.release_name }}
           body_path: CHANGELOG.md
           # draft: true
-        if: contains(github.ref, 'OverworldShuffle') && contains(github.event.head_commit.message, 'Version bump')  # branch/tag name and commit message
+        if: contains(github.event.head_commit.message, "Merge 'OverworldShuffleDev' into OverworldShuffle")  # branch/tag name and commit message
 
       # upload linux archive asset (MASTER)
       #TODO: Make sure we're firing on the proper branches
@@ -383,7 +376,7 @@ jobs:
           asset_path: ${{ steps.parentDir.outputs.parentDir }}/deploy/linux/${{ steps.identify-linux-asset.outputs.asset_linux }}
           asset_name: ${{ steps.debug_info.outputs.asset_prefix }}-linux-focal.tar.gz
           asset_content_type: application/gzip
-        if: contains(github.ref, 'OverworldShuffle') && contains(github.event.head_commit.message, 'Version bump')  # branch/tag name and commit message
+        if: contains(github.event.head_commit.message, "Merge 'OverworldShuffleDev' into OverworldShuffle")  # branch/tag name and commit message
 
       # upload macos archive asset (MASTER)
       #TODO: Make sure we're firing on the proper branches
@@ -397,7 +390,7 @@ jobs:
           asset_path: ${{ steps.parentDir.outputs.parentDir }}/deploy/macos/${{ steps.identify-macos-asset.outputs.asset_macos }}
           asset_name: ${{ steps.debug_info.outputs.asset_prefix }}-osx.tar.gz
           asset_content_type: application/gzip
-        if: contains(github.ref, 'OverworldShuffle') && contains(github.event.head_commit.message, 'Version bump')  # branch/tag name and commit message
+        if: contains(github.event.head_commit.message, "Merge 'OverworldShuffleDev' into OverworldShuffle")  # branch/tag name and commit message
 
       # upload windows archive asset (MASTER)
       #TODO: Make sure we're firing on the proper branches
@@ -411,4 +404,14 @@ jobs:
           asset_path: ${{ steps.parentDir.outputs.parentDir }}/deploy/windows/${{ steps.identify-windows-asset.outputs.asset_windows }}
           asset_name: ${{ steps.debug_info.outputs.asset_prefix }}-windows.zip
           asset_content_type: application/zip
-        if: contains(github.ref, 'OverworldShuffle') && contains(github.event.head_commit.message, 'Version bump')  # branch/tag name and commit message
+        if: contains(github.event.head_commit.message, "Merge 'OverworldShuffleDev' into OverworldShuffle")  # branch/tag name and commit message
+
+      - name: 🖳Tag Baserom
+        uses: ./.github/actions/tag-repo
+        env:
+          FINE_PAT: ${{ secrets.ALTTPER_TAGGER }}
+        with:
+          repository: ${{ github.repository_owner }}/z3randomizer
+          ref-name:   heads/OWMain
+          github-tag: ${{ github.event.release.tag_name }}
+        if: contains(github.event.head_commit.message, "Merge 'OverworldShuffleDev' into OverworldShuffle")