From 7649ac1331fd1e63f0671c0ccffa8451ed0d1593 Mon Sep 17 00:00:00 2001
From: David Dworken <david@daviddworken.com>
Date: Sun, 2 Feb 2025 10:35:19 -0800
Subject: [PATCH] Avoid reusing artifact name to enable GH action upgrade

---
 .github/slsa/.slsa-goreleaser-darwin-amd64.yml | 2 +-
 .github/slsa/.slsa-goreleaser-darwin-arm64.yml | 2 +-
 .github/workflows/slsa-releaser.yml            | 4 ++--
 scripts/actions-sign.py                        | 6 ++++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/slsa/.slsa-goreleaser-darwin-amd64.yml b/.github/slsa/.slsa-goreleaser-darwin-amd64.yml
index ca88555..df0f161 100644
--- a/.github/slsa/.slsa-goreleaser-darwin-amd64.yml
+++ b/.github/slsa/.slsa-goreleaser-darwin-amd64.yml
@@ -9,7 +9,7 @@ flags:
 goos: darwin
 goarch: amd64
 
-binary: hishtory-{{ .Os }}-{{ .Arch }}
+binary: hishtory-{{ .Os }}-{{ .Arch }}-bin
 
 ldflags:
   - '{{ .Env.VERSION_LDFLAGS }}'
diff --git a/.github/slsa/.slsa-goreleaser-darwin-arm64.yml b/.github/slsa/.slsa-goreleaser-darwin-arm64.yml
index 998d8fc..027baf8 100644
--- a/.github/slsa/.slsa-goreleaser-darwin-arm64.yml
+++ b/.github/slsa/.slsa-goreleaser-darwin-arm64.yml
@@ -9,7 +9,7 @@ flags:
 goos: darwin
 goarch: arm64
 
-binary: hishtory-{{ .Os }}-{{ .Arch }}
+binary: hishtory-{{ .Os }}-{{ .Arch }}-bin
 
 ldflags:
   - '{{ .Env.VERSION_LDFLAGS }}'
diff --git a/.github/workflows/slsa-releaser.yml b/.github/workflows/slsa-releaser.yml
index acaca83..6911869 100644
--- a/.github/workflows/slsa-releaser.yml
+++ b/.github/workflows/slsa-releaser.yml
@@ -126,10 +126,10 @@ jobs:
           sleep 60
       - uses: actions/download-artifact@v4
         with:
-          name: hishtory-darwin-arm64
+          name: hishtory-darwin-arm64-bin
       - uses: actions/download-artifact@v4
         with:
-          name: hishtory-darwin-amd64
+          name: hishtory-darwin-amd64-bin
       - name: Download and sign the latest executables
         env: 
           GH_TOKEN: ${{ github.token }}
diff --git a/scripts/actions-sign.py b/scripts/actions-sign.py
index b1045d4..d7e679b 100644
--- a/scripts/actions-sign.py
+++ b/scripts/actions-sign.py
@@ -3,8 +3,8 @@ import time
 import subprocess
 
 def main():
-    assertPresentAndNotAscii("hishtory-darwin-arm64")
-    assertPresentAndNotAscii("hishtory-darwin-amd64")
+    assertPresentAndNotAscii("hishtory-darwin-arm64-bin")
+    assertPresentAndNotAscii("hishtory-darwin-amd64-bin")
     
     print("before sha1sum:")
     os.system("sha1sum hishtory-* 2>&1")
@@ -17,6 +17,8 @@ def main():
     print("signing...")
     os.system("""
     set -emo pipefail
+    mv hishtory-darwin-arm64-bin hishtory-darwin-arm64
+    mv hishtory-darwin-amd64-bin hishtory-darwin-amd64
     cp hishtory-darwin-arm64 hishtory-darwin-arm64-unsigned
     cp hishtory-darwin-amd64 hishtory-darwin-amd64-unsigned
     echo $MACOS_CERTIFICATE | base64 -d > certificate.p12