From 353f30f46bde841a2854fb54dc14e8fb388fdee6 Mon Sep 17 00:00:00 2001 From: jamesread Date: Mon, 29 Jun 2026 00:54:54 +0100 Subject: [PATCH] chore: fixed goreleaser options --- .goreleaser.yml | 3 ++- var/windows/goreleaser-release-with-msi.sh | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index f299d24..a485ed5 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -6,7 +6,8 @@ before: - make windows-resources VERSION={{ .Version }} builds: - - env: + - skip: '{{ isEnvSet "GORELEASER_SKIP_BUILD" }}' + env: - CGO_ENABLED=0 binary: OliveTin main: main.go diff --git a/var/windows/goreleaser-release-with-msi.sh b/var/windows/goreleaser-release-with-msi.sh index d69a5e5..bbdc278 100755 --- a/var/windows/goreleaser-release-with-msi.sh +++ b/var/windows/goreleaser-release-with-msi.sh @@ -2,6 +2,8 @@ set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +REPO_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)" +GORELEASER_CONFIG="${REPO_ROOT}/.goreleaser.yml" TIMEOUT="${GORELEASER_TIMEOUT:-60m}" if [[ -z "${VERSION:-}" ]]; then @@ -9,9 +11,13 @@ if [[ -z "${VERSION:-}" ]]; then exit 1 fi -goreleaser release --clean --timeout "${TIMEOUT}" --skip=checksum,publish "$@" +build_config="$(mktemp)" +trap 'rm -f "${build_config}"' EXIT +awk '/^checksum:/{print; print " disable: true"; next}1' "${GORELEASER_CONFIG}" > "${build_config}" + +goreleaser release -f "${build_config}" --clean --timeout "${TIMEOUT}" --skip=publish "$@" "${SCRIPT_DIR}/build-msi.sh" -goreleaser release --timeout "${TIMEOUT}" \ - --skip=validate,before,build,archive,nfpm,docker,sign,sbom,after,announce "$@" +GORELEASER_SKIP_BUILD=1 goreleaser release --timeout "${TIMEOUT}" \ + --skip=validate,before,archive,nfpm,docker,sign,sbom,announce "$@"