Merge pull request 'Fix using branch for version number' (#209 ) from issue/205 into master

Reviewed-on: #209
Fix using branch for version number
2025-03-12 12:25:49 +00:00 · 2025-03-12 13:24:03 +01:00 · 2025-03-12 12:15:30 +00:00 · 2025-03-12 12:15:09 +00:00 · 2025-03-12 13:11:01 +01:00 · 2025-03-12 11:52:53 +01:00
4 changed files with 39 additions and 10 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/*.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
--- a/.ci/tasks/build.sh
+++ b/.ci/tasks/build.sh
@ -24,8 +24,10 @@ PR=${PR:-}
 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')"
+elif [ -f ".git/branch"]; then
+    ref=$(cat .git/branch)-$(git rev-parse --short $ref)
 else
-    ref=$(git describe --tags)
+    ref=$(git rev-parse --short "$(cat .git/ref || echo "HEAD")")
 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

--- a/.renovaterc
+++ b/.renovaterc
@ -7,5 +7,9 @@
    ":rebaseStalePrs"
  ],
  "prConcurrentLimit": 10,
-  "branchPrefix": "renovate/"
+  "branchPrefix": "renovate/",
+  "baseBranches": [
+    "$default",
+    "/^release\\/.*/"
+  ]
 }
Author	SHA1	Message	Date
Lucas Schwiderski	8cb2c6b2cd	Merge pull request 'Fix using branch for version number' (#209 ) 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: #209	2025-03-12 12:25:49 +00:00
Lucas Schwiderski	6ba13ac1ec	Fix using branch for version number	2025-03-12 13:24:03 +01:00
Lucas Schwiderski	4d0762c0ba	Merge pull request 'Fix branch name in package version' (#207 ) 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: #207	2025-03-12 12:15:30 +00:00
Lucas Schwiderski	752291fe2d	Merge pull request 'Explicitly define base branches' (#208 ) from feat/renovate into master All checks were successful build/msvc Build for the target platform: msvc build/linux Build for the target platform: linux Reviewed-on: #208	2025-03-12 12:15:09 +00:00
Lucas Schwiderski	71f945a96c	Explicitly define base branches Currently, the dependency dashboard lists a bunch of pending updates under a section called "Other branches". I'm not sure, but this sounds like one of the configs I extend from enables base branches other than only the default. To test, and make it explicit, set only the branches I really want checked. I'm adding the `release/.*` regex for now, even though I don't have any release process yet.	2025-03-12 13:11:01 +01:00
Lucas Schwiderski	d15f533e19	Fix branch name in package version All checks were successful lint/clippy Checking for common mistakes and opportunities for code improvement build/msvc Build for the target platform: msvc build/linux Build for the target platform: linux	2025-03-12 11:52:53 +01:00
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