From a4d436b16b0e509dfbd1c78561eae157ebf1e362 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Sun, 21 Jul 2024 14:29:35 +0100 Subject: [PATCH] build: increase goreleaser build timeout CI server is quite slow, so the 30m timeout of goreleaser was being exceeded. Bumped to 60m, as defined by "TIMEOUT" in version.sh. --- package-lock.json | 2 ++ scripts/version.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index c7afbe7..76613cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "any-date-parser": "^1.5.4", "browserslist": "^4.21.7", "cheerio": "^1.0.0-rc.12", + "esbuild": "^0.18.20", "fs-cheerio": "^3.0.0", "inline-source": "^8.0.2", "jsdom": "^22.1.0", @@ -1653,6 +1654,7 @@ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "hasInstallScript": true, + "license": "MIT", "optional": true, "bin": { "esbuild": "bin/esbuild" diff --git a/scripts/version.sh b/scripts/version.sh index 1dc5248..dabd5af 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -16,4 +16,6 @@ else fi JFA_GO_VERSION=$(git describe --exact-match HEAD 2> /dev/null || echo 'vgit') -JFA_GO_CSS_VERSION="v3" JFA_GO_NFPM_EPOCH=$(git rev-list --all --count) JFA_GO_BUILD_TIME=$(date +%s) JFA_GO_BUILT_BY=${JFA_GO_BUILT_BY:-"???"} JFA_GO_VERSION="$(echo $JFA_GO_VERSION | sed 's/v//g')" $@ +TIMEOUT=60m + +JFA_GO_CSS_VERSION="v3" JFA_GO_NFPM_EPOCH=$(git rev-list --all --count) JFA_GO_BUILD_TIME=$(date +%s) JFA_GO_BUILT_BY=${JFA_GO_BUILT_BY:-"???"} JFA_GO_VERSION="$(echo $JFA_GO_VERSION | sed 's/v//g')" $@ --timeout $TIMEOUT