diff --git a/Makefile b/Makefile index 8870c1a..0823db1 100644 --- a/Makefile +++ b/Makefile @@ -13,31 +13,34 @@ release: expr `cat VERSION` + 1 > VERSION git add VERSION git commit -m "Release: start releasing v0.`cat VERSION`" --no-verify + git push && git push --tags # Release linux-amd64 cp .slsa-goreleaser-linux-amd64.yml .slsa-goreleaser.yml git add .slsa-goreleaser.yml git commit -m "Release linux-amd64 v0.`cat VERSION`" --no-verify git tag v0.`cat VERSION`-linux-amd64 + git push && git push --tags # Release darwin-amd64 cp .slsa-goreleaser-darwin-amd64.yml .slsa-goreleaser.yml git add .slsa-goreleaser.yml git commit -m "Release darwin-amd64 v0.`cat VERSION`" --no-verify git tag v0.`cat VERSION`-darwin-amd64 + git push && git push --tags # Release darwin-arm64 cp .slsa-goreleaser-darwin-arm64.yml .slsa-goreleaser.yml git add .slsa-goreleaser.yml git commit -m "Release darwin-arm64 v0.`cat VERSION`" --no-verify git tag v0.`cat VERSION`-darwin-arm64 + git push && git push --tags # Clean up by removing .slsa-goreleaser.yml rm .slsa-goreleaser.yml git add .slsa-goreleaser.yml git commit -m "Release: finish releasing v0.`cat VERSION`" --no-verify git tag v0.`cat VERSION`-xattr + git push && git push --tags # Tag the release gh release create v0.`cat VERSION` --generate-notes - # Push to trigger the releases - git push - git push --tags + git push && git push --tags build-static: docker build -t gcr.io/dworken-k8s/hishtory-static -f backend/web/caddy/Dockerfile . diff --git a/client/lib/lib.go b/client/lib/lib.go index b1f5014..6acb341 100644 --- a/client/lib/lib.go +++ b/client/lib/lib.go @@ -770,9 +770,17 @@ func setCodesigningXattrs(downloadInfo shared.UpdateInfo, filename string) error } else { return fmt.Errorf("setCodesigningXattrs only supports arm64 and amd64: %#v", runtime.GOARCH) } - xattrDump, err := ApiGet(url) + resp, err := http.Get(url) if err != nil { - return fmt.Errorf("failed to get xattr dump: %v", err) + return fmt.Errorf("failed to GET %s: %v", url, err) + } + defer resp.Body.Close() + if resp.StatusCode != 200 { + return fmt.Errorf("failed to GET %s: status_code=%d", url, resp.StatusCode) + } + xattrDump, err := ioutil.ReadAll(resp.Body) + if err != nil { + return fmt.Errorf("failed to read response body from GET %s: %v", url, err) } setXattr(filename, string(xattrDump)) return nil