From bd0517e1563da86f3656dda53919f3c4a5ce523c Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Mon, 21 Mar 2022 11:19:49 +0000
Subject: [PATCH 1/2] Bump actions to v5

---
 ...lled-baseimage-update.yml => call-baseimage-update.yml} | 6 +++---
 .../{called-bakebuild.yml => call-build-image.yml}         | 7 +++----
 .../{called-ci.yml => call-check-and-release.yml}          | 5 +++--
 release-versions/lsiobase-alpine-latest.txt                | 1 -
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename .github/workflows/{called-baseimage-update.yml => call-baseimage-update.yml} (84%)
 rename .github/workflows/{called-bakebuild.yml => call-build-image.yml} (60%)
 rename .github/workflows/{called-ci.yml => call-check-and-release.yml} (60%)
 delete mode 100644 release-versions/lsiobase-alpine-latest.txt

diff --git a/.github/workflows/called-baseimage-update.yml b/.github/workflows/call-baseimage-update.yml
similarity index 84%
rename from .github/workflows/called-baseimage-update.yml
rename to .github/workflows/call-baseimage-update.yml
index 5864d81..27f58a5 100644
--- a/.github/workflows/called-baseimage-update.yml
+++ b/.github/workflows/call-baseimage-update.yml
@@ -6,11 +6,11 @@ on:
 
 jobs:
   call-workflow:
-    uses: thespad/actions/.github/workflows/check-baseimage-update.yml@v4
+    uses: thespad/actions/.github/workflows/check-baseimage-update.yml@v5
     with:
       repo_owner: ${{ github.repository_owner }}
-      baseimage: alpine
-      email: git@spad.co.uk
+      baseimage: "alpine"
+      basebranch: "master"
       app_name: "py-kms"
     secrets:
       repo_scoped_token: ${{ secrets.repo_scoped_token }}
diff --git a/.github/workflows/called-bakebuild.yml b/.github/workflows/call-build-image.yml
similarity index 60%
rename from .github/workflows/called-bakebuild.yml
rename to .github/workflows/call-build-image.yml
index 61da355..a086a58 100644
--- a/.github/workflows/called-bakebuild.yml
+++ b/.github/workflows/call-build-image.yml
@@ -4,16 +4,15 @@ on:
   release:
     types: [ published ]
   pull_request:
-    branches:
-      - 'main'
-    types: [ assigned ]
 
 jobs:
   call-workflow:
-    uses: thespad/actions/.github/workflows/bakebuild.yml@v4
+    uses: thespad/actions/.github/workflows/build-image.yml@v5
     with:
       repo_owner: ${{ github.repository_owner }}
       app_name: "py-kms"
+      release_type: "github_commit"
+      release_url: "https://api.github.com/repos/Py-KMS-Organization/py-kms/commits/master"
       dockerhub_user: "thespad"
     secrets:
       dockerhub_password: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.github/workflows/called-ci.yml b/.github/workflows/call-check-and-release.yml
similarity index 60%
rename from .github/workflows/called-ci.yml
rename to .github/workflows/call-check-and-release.yml
index 64092e5..244512b 100644
--- a/.github/workflows/called-ci.yml
+++ b/.github/workflows/call-check-and-release.yml
@@ -7,10 +7,11 @@ on:
 
 jobs:
   call-workflow:
-    uses: thespad/actions/.github/workflows/ci.yml@v4
+    uses: thespad/actions/.github/workflows/check-and-release.yml@v5
     with:
       repo_owner: ${{ github.repository_owner }}
       app_name: "py-kms"
-      release_type: "script"
+      release_type: "github_commit"
+      release_url: "https://api.github.com/repos/Py-KMS-Organization/py-kms"
     secrets:
       repo_scoped_token: ${{ secrets.repo_scoped_token }}
diff --git a/release-versions/lsiobase-alpine-latest.txt b/release-versions/lsiobase-alpine-latest.txt
deleted file mode 100644
index 6eba7b4..0000000
--- a/release-versions/lsiobase-alpine-latest.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.15-a3968187-ls8

From 32e8cc05016eaff5d5171b7517a32a96f8c19ae2 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Mon, 21 Mar 2022 11:28:39 +0000
Subject: [PATCH 2/2] Fix commit URL

---
 .github/workflows/call-check-and-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/call-check-and-release.yml b/.github/workflows/call-check-and-release.yml
index 244512b..f498a0a 100644
--- a/.github/workflows/call-check-and-release.yml
+++ b/.github/workflows/call-check-and-release.yml
@@ -12,6 +12,6 @@ jobs:
       repo_owner: ${{ github.repository_owner }}
       app_name: "py-kms"
       release_type: "github_commit"
-      release_url: "https://api.github.com/repos/Py-KMS-Organization/py-kms"
+      release_url: "https://api.github.com/repos/Py-KMS-Organization/py-kms/commits/master"
     secrets:
       repo_scoped_token: ${{ secrets.repo_scoped_token }}