From 90b459a5c1e83180b7eee0021cfe15e65545fe4e Mon Sep 17 00:00:00 2001
From: Erik Osterman <erik@cloudposse.com>
Date: Tue, 21 May 2024 11:52:58 -0500
Subject: [PATCH] chore: Update GitHub Workflows to use shared workflows from
 '.github' repo

---
 .../{release-branch.yml => branch.yml}        |  9 +++++++--
 ...feature-branch-chatops.yml => chatops.yml} |  4 ++--
 .github/workflows/feature-branch.yml          | 19 -------------------
 .github/workflows/release-published.yml       | 13 -------------
 .github/workflows/release.yml                 | 13 +++++++++++++
 .github/workflows/scheduled.yml               |  2 +-
 6 files changed, 23 insertions(+), 37 deletions(-)
 rename .github/workflows/{release-branch.yml => branch.yml} (52%)
 rename .github/workflows/{feature-branch-chatops.yml => chatops.yml} (60%)
 delete mode 100644 .github/workflows/feature-branch.yml
 delete mode 100644 .github/workflows/release-published.yml
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release-branch.yml b/.github/workflows/branch.yml
similarity index 52%
rename from .github/workflows/release-branch.yml
rename to .github/workflows/branch.yml
index 852d5e3..fd64cd8 100644
--- a/.github/workflows/release-branch.yml
+++ b/.github/workflows/branch.yml
@@ -1,6 +1,11 @@
 ---
-name: release-branch
+name: Branch
 on:
+  pull_request:
+    branches:
+      - main
+      - release/**
+    types: [opened, synchronize, reopened, labeled, unlabeled]
   push:
     branches:
       - main
@@ -16,5 +21,5 @@ permissions: {}
 
 jobs:
   terraform-module:
-    uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-branch.yml@main
+    uses: cloudposse/.github/.github/workflows/shared-terraform-module.yml@main
     secrets: inherit
diff --git a/.github/workflows/feature-branch-chatops.yml b/.github/workflows/chatops.yml
similarity index 60%
rename from .github/workflows/feature-branch-chatops.yml
rename to .github/workflows/chatops.yml
index 9abfc61..c3d47fa 100644
--- a/.github/workflows/feature-branch-chatops.yml
+++ b/.github/workflows/chatops.yml
@@ -1,5 +1,5 @@
 ---
-name: feature-branch-chatops
+name: chatops
 on:
   issue_comment:
     types: [created]
@@ -11,6 +11,6 @@ permissions:
 
 jobs:
   terraform-module:
-    uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/feature-branch-chatops.yml@main
+    uses: cloudposse/.github/.github/workflows/shared-terraform-chatops.yml@main
     secrets:
       github_access_token: ${{ secrets.REPO_ACCESS_TOKEN }}
diff --git a/.github/workflows/feature-branch.yml b/.github/workflows/feature-branch.yml
deleted file mode 100644
index ebd8854..0000000
--- a/.github/workflows/feature-branch.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: feature-branch
-on:
-  pull_request:
-    branches:
-      - main
-      - release/**
-    types: [opened, synchronize, reopened, labeled, unlabeled]
-
-permissions:
-  pull-requests: write
-  id-token: write
-  contents: write
-  issues: write
-
-jobs:
-  terraform-module:
-    uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/feature-branch.yml@main
-    secrets: inherit
diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml
deleted file mode 100644
index 1b0aaca..0000000
--- a/.github/workflows/release-published.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: release-published
-on:
-  release:
-    types:
-      - published
-
-permissions: {}
-
-jobs:
-  terraform-module:
-    uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-published.yml@main
-    secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..f968068
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,13 @@
+---
+name: release
+on:
+  release:
+    types:
+      - published
+
+permissions: {}
+
+jobs:
+  terraform-module:
+    uses: cloudposse/.github/.github/workflows/shared-release-branches.yml@main
+    secrets: inherit
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index 7bc09ab..a79e949 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -12,5 +12,5 @@ permissions:
 
 jobs:
   scheduled:
-    uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/scheduled.yml@main
+    uses: cloudposse/.github/.github/workflows/shared-terraform-scheduled.yml@main
     secrets: inherit