From 9bea106eaf9a71e96c20fcc9a8959147b203fa0e Mon Sep 17 00:00:00 2001
From: Alan Norton <git@nonration.al>
Date: Sun, 6 Mar 2022 11:05:49 -0500
Subject: [PATCH] workflow_dispatch, stage to rel, drop into pkg

---
 .github/workflows/ci.yml      | 12 +++++-----
 .github/workflows/release.yml | 42 +++++++++++++++++++++++++----------
 Makefile                      |  4 ++--
 gon_amd64.json                |  4 ++--
 gon_arm64.json                |  4 ++--
 5 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc4ee7e..b866a85 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,12 +1,12 @@
 name: ci
 
 on:
-  # build pushes to master
-  push:
-    branches:
-      - master
-  # build PRs from forks
-  pull_request:
+  # # build pushes to master
+  # push:
+  #   branches:
+  #     - master
+  # # build PRs from forks
+  # pull_request:
 
 jobs:
   test:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d0a8e24..926db07 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,11 +1,20 @@
 name: release
 
 on:
-  push:
-    tags:
-      - "v*"
-    branches:
-      - "notarize-binaries"
+  workflow_dispatch:
+    inputs:
+      ac_username:
+        description: 'Apple Developer Username'
+        required: true
+      ac_password:
+        description: 'Apple Developer Password'
+        required: true
+      certificate:
+        description: 'Signing Certificate'
+        required: true
+      certificate_password:
+        description: 'Certificate Password'
+        require: true
 
 jobs:
   release:
@@ -33,12 +42,21 @@ jobs:
       - run: make release
         env:
           RELEASE: ${{ steps.get_version.outputs.RELEASE_VERSION }}
+          AC_USERNAME: ${{ github.event.inputs.ac_username }}
+          AC_PASSWORD: ${{ github.event.inputs.ac_password }}
+          APPLE_DEVELOPER_CERTIFICATE_P12_BASE64: ${{ github.event.inputs.certificate }}
+          APPLE_DEVELOPER_CERTIFICATE_PASSWORD: ${{ github.event.inputs.certificate_password }}
 
-      - uses: ncipollo/release-action@v1
+      - uses: actions/upload-artifact@v2
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "pkg/*"
-          allowUpdates: true
-          omitBody: true
-          prerelease: true
-          removeArtifacts: true
+          name: puma-dev-${{ steps.get_version.outputs.RELEASE_VERSION }}-linux-amd64
+          path: pkg
+
+      # - uses: ncipollo/release-action@v1
+      #   with:
+      #     token: ${{ secrets.GITHUB_TOKEN }}
+      #     artifacts: "pkg/*"
+      #     allowUpdates: true
+      #     omitBody: true
+      #     prerelease: true
+      #     removeArtifacts: true
diff --git a/Makefile b/Makefile
index 6c0b24a..30b6dfe 100644
--- a/Makefile
+++ b/Makefile
@@ -34,10 +34,10 @@ release-build:
 
 release-package-darwin:
 	gon -log-level=debug -log-json ./gon_amd64.json
-	mv pkg/puma-dev-darwin-amd64.tar.gz "pkg/puma-dev-$$RELEASE-darwin-amd64.zip"
+	mv rel/puma-dev-darwin-amd64.zip "pkg/puma-dev-$$RELEASE-darwin-amd64.zip"
 
 	gon -log-level=debug -log-json ./gon_arm64.json
-	mv pkg/puma-dev-darwin-arm64.tar.gz "pkg/puma-dev-$$RELEASE-darwin-arm64.zip"
+	mv rel/puma-dev-darwin-arm64.zip "pkg/puma-dev-$$RELEASE-darwin-arm64.zip"
 
 release-package-linux:
 	tar -C rel/linux_amd64 -cvzf "pkg/puma-dev-$$RELEASE-linux-amd64.tar.gz" puma-dev
diff --git a/gon_amd64.json b/gon_amd64.json
index ebee7f6..dd09e3c 100644
--- a/gon_amd64.json
+++ b/gon_amd64.json
@@ -5,9 +5,9 @@
         "password":  "@env:AC_PASSWORD"
     },
     "sign" :{
-        "application_identity" : "XXXXX"
+        "application_identity" : "4109FE37B3316E057848BAD83F15BBF104D943A8"
     },
     "zip" :{
-        "output_path" : "pkg/puma-dev-darwin-amd64.tar.gz"
+        "output_path" : "rel/puma-dev-darwin-amd64.zip"
     }
 }
diff --git a/gon_arm64.json b/gon_arm64.json
index a161776..f8984ad 100644
--- a/gon_arm64.json
+++ b/gon_arm64.json
@@ -5,9 +5,9 @@
         "password":  "@env:AC_PASSWORD"
     },
     "sign" :{
-        "application_identity" : "XXXXX"
+        "application_identity" : "4109FE37B3316E057848BAD83F15BBF104D943A8"
     },
     "zip" :{
-        "output_path" : "pkg/puma-dev-darwin-arm64.tar.gz"
+        "output_path" : "rel/puma-dev-darwin-arm64.zip"
     }
 }