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

Reviewed-on: #206
Push a packaged with a fixed version for master
2025-03-12 10:46:26 +00:00 · 2025-03-12 11:33:48 +01:00 · 2025-03-12 11:26:24 +01:00
3 changed files with 33 additions and 9 deletions
--- a/.ci/pipelines/base.yml
+++ b/.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/dtmm.sha256
-        - artifact/*.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
--- a/.ci/tasks/build.sh
+++ b/.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'"
--- a/.ci/tasks/build.yml
+++ b/.ci/tasks/build.yml
@ -22,7 +22,6 @@ caches:
 params:
  CI: "true"
  TARGET: ((target))
  GITEA_API_KEY: ((gitea_api_key))
  PR: ((pr))
  OUTPUT: artifact
Author	SHA1	Message	Date
Lucas Schwiderski	1a3c564ecf	Merge pull request 'Improve CI artifact version names' (#206 ) from issue/205 into master All checks were successful build/msvc Build for the target platform: msvc build/linux Build for the target platform: linux Reviewed-on: #206	2025-03-12 10:46:26 +00:00
Lucas Schwiderski	beba47f340	Push a packaged with a fixed version for master All checks were successful build/msvc Build for the target platform: msvc lint/clippy Checking for common mistakes and opportunities for code improvement build/linux Build for the target platform: linux To provide something that can easily be linked to, also push packages built from `master` to a version that doesn't contain the SHA.	2025-03-12 11:33:48 +01:00
Lucas Schwiderski	5612e271fb	Improve version name for CI artifacts built off master The name from `git describe --tags` is rather confusing to people that aren't familiar with it. Especially in the current situation, where there are no proper versioned releases. A name like `master-123456` should be much clearer. Closes #205.	2025-03-12 11:26:24 +01:00