From de99df62a5ef8d6ecf1228cfea8f0e121077eba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Hedenstr=C3=B6m?= <erik@hedenstroem.com>
Date: Fri, 4 Feb 2022 18:41:34 +0100
Subject: [PATCH] Fixed artifact glob pattern

---
 .gitlab-ci.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2c58c7..30d0631 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,20 +19,19 @@ stages:
   script:
     - go generate constant/version.go
     - CI_JOB_ARR=(${CI_JOB_NAME//-/ })
-    - echo ${CI_JOB_ARR[0]} ${CI_JOB_ARR[1]} ${CI_JOB_ARR[2]} $CI_PROJECT_NAME-${CI_JOB_ARR[0]}-${CI_JOB_ARR[2]}
-    - GOOS=${CI_JOB_ARR[0]} GOARCH=${CI_JOB_ARR[1]} CGO_ENABLED=0 go build -tags netgo -ldflags '-s -w -extldflags "-static"' -o $CI_PROJECT_NAME-${CI_JOB_ARR[0]}-${CI_JOB_ARR[2]}
-    - ./upx -q --brute $CI_PROJECT_NAME-${CI_JOB_ARR[0]}-${CI_JOB_ARR[2]}
+    - GOOS=${CI_JOB_ARR[0]} GOARCH=${CI_JOB_ARR[1]} CGO_ENABLED=0 go build -tags netgo -ldflags '-s -w -extldflags "-static"' -o ${CI_PROJECT_NAME}-${CI_JOB_ARR[0]}-${CI_JOB_ARR[2]}
+    - ./upx -q --brute ${CI_PROJECT_NAME}-${CI_JOB_ARR[0]}-${CI_JOB_ARR[2]}
   artifacts:
-    name: "$CI_PROJECT_NAME-$CI_JOB_NAME"
+    name: "$CI_PROJECT_NAME"
     paths:
-      - $CI_PROJECT_NAME-$CI_JOB_NAME
+      - $CI_PROJECT_NAME-*
 
 version.txt:
   stage: build
   only:
     - /^\d+[.]\d+[.]\d+$/
   script:
-    - git describe --tags --long > $CI_PROJECT_NAME-version.txt
+    - git describe --tags --long --always > $CI_PROJECT_NAME-version.txt
   artifacts:
     name: "$CI_PROJECT_NAME-version"
     paths:
-- 
GitLab