Revert "Avoid reusing artifact name to enable GH action upgrade"

This reverts commit 7649ac1331fd1e63f0671c0ccffa8451ed0d1593.
This commit is contained in:
David Dworken 2025-02-02 11:09:01 -08:00
parent 7649ac1331
commit 3d19e69463
No known key found for this signature in database
4 changed files with 6 additions and 8 deletions

View File

@ -9,7 +9,7 @@ flags:
goos: darwin goos: darwin
goarch: amd64 goarch: amd64
binary: hishtory-{{ .Os }}-{{ .Arch }}-bin binary: hishtory-{{ .Os }}-{{ .Arch }}
ldflags: ldflags:
- '{{ .Env.VERSION_LDFLAGS }}' - '{{ .Env.VERSION_LDFLAGS }}'

View File

@ -9,7 +9,7 @@ flags:
goos: darwin goos: darwin
goarch: arm64 goarch: arm64
binary: hishtory-{{ .Os }}-{{ .Arch }}-bin binary: hishtory-{{ .Os }}-{{ .Arch }}
ldflags: ldflags:
- '{{ .Env.VERSION_LDFLAGS }}' - '{{ .Env.VERSION_LDFLAGS }}'

View File

@ -126,10 +126,10 @@ jobs:
sleep 60 sleep 60
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
with: with:
name: hishtory-darwin-arm64-bin name: hishtory-darwin-arm64
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
with: with:
name: hishtory-darwin-amd64-bin name: hishtory-darwin-amd64
- name: Download and sign the latest executables - name: Download and sign the latest executables
env: env:
GH_TOKEN: ${{ github.token }} GH_TOKEN: ${{ github.token }}

View File

@ -3,8 +3,8 @@ import time
import subprocess import subprocess
def main(): def main():
assertPresentAndNotAscii("hishtory-darwin-arm64-bin") assertPresentAndNotAscii("hishtory-darwin-arm64")
assertPresentAndNotAscii("hishtory-darwin-amd64-bin") assertPresentAndNotAscii("hishtory-darwin-amd64")
print("before sha1sum:") print("before sha1sum:")
os.system("sha1sum hishtory-* 2>&1") os.system("sha1sum hishtory-* 2>&1")
@ -17,8 +17,6 @@ def main():
print("signing...") print("signing...")
os.system(""" os.system("""
set -emo pipefail 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-arm64 hishtory-darwin-arm64-unsigned
cp hishtory-darwin-amd64 hishtory-darwin-amd64-unsigned cp hishtory-darwin-amd64 hishtory-darwin-amd64-unsigned
echo $MACOS_CERTIFICATE | base64 -d > certificate.p12 echo $MACOS_CERTIFICATE | base64 -d > certificate.p12