Compare commits

..

No commits in common. "1a3c564ecf9f683ef2b137baed2ede0ec9dc229f" and "69300e87e6bfb126c631c77e17390be45b8c6876" have entirely different histories.

3 changed files with 9 additions and 33 deletions

View file

@ -125,6 +125,8 @@ jobs:
vars: vars:
pr: "" pr: ""
target: msvc target: msvc
gitea_url: http://forgejo:3000
gitea_api_key: ((gitea_api_key))
- load_var: version_number - load_var: version_number
reveal: true reveal: true
@ -140,21 +142,10 @@ jobs:
fail_fast: true fail_fast: true
override: true override: true
globs: globs:
- artifact/dtmt
- artifact/dtmm
- artifact/*.exe - artifact/*.exe
- artifact/*.exe.sha256 - artifact/*.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 - name: build-linux
on_success: on_success:
@ -211,20 +202,5 @@ jobs:
globs: globs:
- artifact/dtmt - artifact/dtmt
- artifact/dtmm - artifact/dtmm
- artifact/dtmm.sha256 - artifact/*.exe
- artifact/dtmt.sha256 - artifact/*.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

View file

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

View file

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