Merge pull request 'Improve CI artifact version names' (#206) from issue/205 into master

Reviewed-on: #206

.ci/pipelines/base.yml

@@ -125,8 +125,6 @@ jobs:
     vars:
       pr: ""
       target: msvc
-      gitea_url: http://forgejo:3000
-      gitea_api_key: ((gitea_api_key))
 
   - load_var: version_number
     reveal: true
@@ -142,10 +140,21 @@ jobs:
       fail_fast: true
       override: true
       globs:
-        - artifact/dtmt
-        - artifact/dtmm
         - artifact/*.exe
-        - artifact/*.sha256
+        - artifact/*.exe.sha256
+
+  - put: package
+    resource: gitea-package
+    no_get: true
+    inputs:
+      - artifact
+    params:
+      version: master
+      fail_fast: true
+      override: true
+      globs:
+        - artifact/*.exe
+        - artifact/*.exe.sha256
 
 - name: build-linux
   on_success:
@@ -202,5 +211,20 @@ jobs:
       globs:
         - artifact/dtmt
         - artifact/dtmm
-        - artifact/*.exe
-        - artifact/*.sha256
+        - artifact/dtmm.sha256
+        - artifact/dtmt.sha256
+
+  - put: package
+    resource: gitea-package
+    no_get: true
+    inputs:
+      - artifact
+    params:
+      version: master
+      fail_fast: true
+      override: true
+      globs:
+        - artifact/dtmt
+        - artifact/dtmm
+        - artifact/dtmm.sha256
+        - artifact/dtmt.sha256

.ci/tasks/build.sh

@@ -25,7 +25,8 @@ if [ -n "$PR" ]; then
     title "PR: $(echo "$PR" | jq '.number') - $(echo "$PR" | jq '.title')"
     ref="pr-$(echo "$PR" | jq '.number')-$(git rev-parse --short "$(cat .git/ref || echo "HEAD")" 2>/dev/null || echo 'manual')"
 else
-    ref=$(git describe --tags)
+    ref=$(cat .git/ref || echo "HEAD")
+    ref=$(git rev-parse --abbrev-ref $ref)-$(git rev-parse --short $ref)
 fi
 
 title "Version: '$ref'"

.ci/tasks/build.yml

@@ -22,7 +22,6 @@ caches:
 params:
   CI: "true"
   TARGET: ((target))
-  GITEA_API_KEY: ((gitea_api_key))
   PR: ((pr))
   OUTPUT: artifact