diff --git a/.github/slsa/.slsa-goreleaser-darwin-amd64.yml b/.github/slsa/.slsa-goreleaser-darwin-amd64.yml index df0f161..ca88555 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 }}-bin +binary: hishtory-{{ .Os }}-{{ .Arch }} ldflags: - '{{ .Env.VERSION_LDFLAGS }}' diff --git a/.github/slsa/.slsa-goreleaser-darwin-arm64.yml b/.github/slsa/.slsa-goreleaser-darwin-arm64.yml index 027baf8..998d8fc 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 }}-bin +binary: hishtory-{{ .Os }}-{{ .Arch }} ldflags: - '{{ .Env.VERSION_LDFLAGS }}' diff --git a/.github/workflows/slsa-releaser.yml b/.github/workflows/slsa-releaser.yml index 6911869..acaca83 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-bin + name: hishtory-darwin-arm64 - uses: actions/download-artifact@v4 with: - name: hishtory-darwin-amd64-bin + name: hishtory-darwin-amd64 - 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 d7e679b..b1045d4 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-bin") - assertPresentAndNotAscii("hishtory-darwin-amd64-bin") + assertPresentAndNotAscii("hishtory-darwin-arm64") + assertPresentAndNotAscii("hishtory-darwin-amd64") print("before sha1sum:") os.system("sha1sum hishtory-* 2>&1") @@ -17,8 +17,6 @@ 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