From 03d7c75ebf1b81b12ec21f95eef1c07b265ff939 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Sat, 2 Apr 2022 15:40:09 +0200
Subject: [chore] Update Go version to 1.18 (#444)

* linting with new golangci-lint version

* update go to 1.18

* bump versions in drone.yml

* use new runtime/debug package for version info

* remove Commit build flag from goreleaser

* remove mock commit + version from build script

* go fmt

* add dummy version env flag to test container

* install git in golang container for testing

* only set versionString if Version is defined
---
 scripts/build.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build.sh b/scripts/build.sh
index 6c3f86778..4ad10e03c 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -2,10 +2,7 @@
 
 set -eu
 
-COMMIT="${COMMIT:-1234567}"
-VERSION="${VERSION:-0.0.0}"
-
 CGO_ENABLED=0 go build -trimpath \
                        -tags 'netgo osusergo static_build' \
-                       -ldflags="-s -w -extldflags '-static' -X 'main.Commit=${COMMIT}' -X 'main.Version=${VERSION}'" \
+                       -ldflags="-s -w -extldflags '-static' -X 'main.Version=${VERSION:-$(git describe --tags --abbrev=0)}'" \
                        ./cmd/gotosocial
-- 
cgit v1.2.3