diff --git a/.ci/pipelines/base.yml b/.ci/pipelines/base.yml index 8d3cc77..474c090 100644 --- a/.ci/pipelines/base.yml +++ b/.ci/pipelines/base.yml @@ -125,6 +125,8 @@ jobs: vars: pr: "" target: msvc + gitea_url: http://forgejo:3000 + gitea_api_key: ((gitea_api_key)) - load_var: version_number reveal: true @@ -140,21 +142,10 @@ jobs: fail_fast: true override: true globs: + - artifact/dtmt + - artifact/dtmm - artifact/*.exe - - 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 + - artifact/*.sha256 - name: build-linux on_success: @@ -211,20 +202,5 @@ jobs: globs: - artifact/dtmt - artifact/dtmm - - 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 + - artifact/*.exe + - artifact/*.sha256 diff --git a/.ci/tasks/build.sh b/.ci/tasks/build.sh index 11b0300..bb96775 100755 --- a/.ci/tasks/build.sh +++ b/.ci/tasks/build.sh @@ -25,8 +25,7 @@ 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=$(cat .git/ref || echo "HEAD") - ref=$(git rev-parse --abbrev-ref $ref)-$(git rev-parse --short $ref) + ref=$(git describe --tags) fi title "Version: '$ref'" diff --git a/.ci/tasks/build.yml b/.ci/tasks/build.yml index a7f47b4..dce44d0 100644 --- a/.ci/tasks/build.yml +++ b/.ci/tasks/build.yml @@ -22,6 +22,7 @@ caches: params: CI: "true" TARGET: ((target)) + GITEA_API_KEY: ((gitea_api_key)) PR: ((pr)) OUTPUT: artifact