From 42c057142bf6b28358a446ccbf1b996e47c93ad0 Mon Sep 17 00:00:00 2001 From: Grant Linville Date: Tue, 23 Apr 2024 14:22:04 -0400 Subject: [PATCH 1/3] chore: include gptscript-credential-helpers in packaging Signed-off-by: Grant Linville --- .gitignore | 1 + .goreleaser.yml | 8 +++++++- scripts/copy-cred-helper.sh | 26 ++++++++++++++++++++++++++ scripts/download-cred-helpers.sh | 17 +++++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100755 scripts/copy-cred-helper.sh create mode 100755 scripts/download-cred-helpers.sh diff --git a/.gitignore b/.gitignore index 8935c9d2..759e3286 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ **/__pycache__ /docs/yarn.lock /releases +/binaries /checksums.txt /.env* diff --git a/.goreleaser.yml b/.goreleaser.yml index dbd8b6d2..964f6439 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -6,6 +6,7 @@ before: hooks: # Generate UI assets to embedded in binaries - make build-ui + - ./scripts/download-cred-helpers.sh builds: - id: default @@ -21,12 +22,16 @@ builds: - -s - -w - -X "github.com/gptscript-ai/gptscript/pkg/version.Tag=v{{ .Version }}" + hooks: + post: ./scripts/copy-cred-helper.sh {{ .Os }} {{ .Arch }} universal_binaries: - id: mac ids: - default replace: true + hooks: + post: cp binaries/gptscript-credential-osxkeychain releases/mac_darwin_all archives: - id: default @@ -60,8 +65,9 @@ brews: - description: "GPTScript CLI" install: | bin.install "gptscript" + {{ if eq .Os "darwin" }}bin.install "gptscript-credential-osxkeychain"{{ end }} homepage: "https://github.com/gptscript-ai/gptscript" - skip_upload: false + skip_upload: true folder: "Formula" repository: owner: gptscript-ai diff --git a/scripts/copy-cred-helper.sh b/scripts/copy-cred-helper.sh new file mode 100755 index 00000000..f451c2d8 --- /dev/null +++ b/scripts/copy-cred-helper.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -euo pipefail + +OS="$1" +ARCH="$2" + +case "$OS" in + "darwin") + case "$ARCH" in + "amd64") + cp binaries/gptscript-credential-osxkeychain releases/default_darwin_amd64_v1 + ;; + "arm64") + cp binaries/gptscript-credential-osxkeychain releases/default_darwin_arm64 + ;; + esac + ;; + "windows") + case "$ARCH" in + "amd64") + cp binaries/gptscript-credential-wincred.exe releases/default_windows_amd64_v1 + ;; + esac + ;; +esac diff --git a/scripts/download-cred-helpers.sh b/scripts/download-cred-helpers.sh new file mode 100755 index 00000000..4018f3f1 --- /dev/null +++ b/scripts/download-cred-helpers.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +set -euo pipefail + +# This script downloads the gptscript-credential-helpers. (For use in CI.) + +GPTSCRIPT_CRED_HELPERS_VERSION="v0.1.0" +BINARY_DIR="binaries" + +mkdir -p "$BINARY_DIR" +cd "$BINARY_DIR" + +wget -O gptscript-credential-osxkeychain "https://github.com/gptscript-ai/gptscript-credential-helpers/releases/download/${GPTSCRIPT_CRED_HELPERS_VERSION}/gptscript-credential-osxkeychain" +chmod +x gptscript-credential-osxkeychain + +wget -O gptscript-credential-wincred.exe "https://github.com/gptscript-ai/gptscript-credential-helpers/releases/download/${GPTSCRIPT_CRED_HELPERS_VERSION}/gptscript-credential-wincred-${GPTSCRIPT_CRED_HELPERS_VERSION}.windows-amd64.exe" +chmod +x gptscript-credential-wincred.exe From f9dd67c42f3e718076e47048144e6261ad847f4f Mon Sep 17 00:00:00 2001 From: Grant Linville Date: Tue, 23 Apr 2024 14:56:48 -0400 Subject: [PATCH 2/3] don't skip upload Signed-off-by: Grant Linville --- .goreleaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 964f6439..5df898e8 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -67,7 +67,7 @@ brews: bin.install "gptscript" {{ if eq .Os "darwin" }}bin.install "gptscript-credential-osxkeychain"{{ end }} homepage: "https://github.com/gptscript-ai/gptscript" - skip_upload: true + skip_upload: false folder: "Formula" repository: owner: gptscript-ai From 38df29b930e927b83a73117fbb88b83bb38ce067 Mon Sep 17 00:00:00 2001 From: Grant Linville Date: Wed, 24 Apr 2024 14:25:48 -0400 Subject: [PATCH 3/3] add windows arm64 Signed-off-by: Grant Linville --- scripts/copy-cred-helper.sh | 5 ++++- scripts/download-cred-helpers.sh | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/copy-cred-helper.sh b/scripts/copy-cred-helper.sh index f451c2d8..afe5a74c 100755 --- a/scripts/copy-cred-helper.sh +++ b/scripts/copy-cred-helper.sh @@ -19,7 +19,10 @@ case "$OS" in "windows") case "$ARCH" in "amd64") - cp binaries/gptscript-credential-wincred.exe releases/default_windows_amd64_v1 + cp binaries/gptscript-credential-wincred-amd64.exe releases/default_windows_amd64_v1/gptscript-credential-wincred.exe + ;; + "arm64") + cp binaries/gptscript-credential-wincred-arm64.exe releases/default_windows_arm64/gptscript-credential-wincred.exe ;; esac ;; diff --git a/scripts/download-cred-helpers.sh b/scripts/download-cred-helpers.sh index 4018f3f1..ae940466 100755 --- a/scripts/download-cred-helpers.sh +++ b/scripts/download-cred-helpers.sh @@ -13,5 +13,8 @@ cd "$BINARY_DIR" wget -O gptscript-credential-osxkeychain "https://github.com/gptscript-ai/gptscript-credential-helpers/releases/download/${GPTSCRIPT_CRED_HELPERS_VERSION}/gptscript-credential-osxkeychain" chmod +x gptscript-credential-osxkeychain -wget -O gptscript-credential-wincred.exe "https://github.com/gptscript-ai/gptscript-credential-helpers/releases/download/${GPTSCRIPT_CRED_HELPERS_VERSION}/gptscript-credential-wincred-${GPTSCRIPT_CRED_HELPERS_VERSION}.windows-amd64.exe" -chmod +x gptscript-credential-wincred.exe +wget -O gptscript-credential-wincred-amd64.exe "https://github.com/gptscript-ai/gptscript-credential-helpers/releases/download/${GPTSCRIPT_CRED_HELPERS_VERSION}/gptscript-credential-wincred-${GPTSCRIPT_CRED_HELPERS_VERSION}.windows-amd64.exe" +chmod +x gptscript-credential-wincred-amd64.exe + +wget -O gptscript-credential-wincred-arm64.exe "https://github.com/gptscript-ai/gptscript-credential-helpers/releases/download/${GPTSCRIPT_CRED_HELPERS_VERSION}/gptscript-credential-wincred-${GPTSCRIPT_CRED_HELPERS_VERSION}.windows-arm64.exe" +chmod +x gptscript-credential-wincred-arm64.exe