ci: fix build scripts to handle multi-tags

This commit is contained in:
tobyxdd 2022-12-10 18:14:17 -08:00
parent 7430f37b21
commit dd4c17972f
4 changed files with 9 additions and 17 deletions

View file

@ -4,10 +4,6 @@ on:
push:
tags:
- 'v*'
branches:
- master
- main
- release
jobs:
docker:
@ -21,7 +17,7 @@ jobs:
- name: Get tag
id: get_tag
run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
run: echo "TAG=$(git describe --tags --always --match 'v*')" >> $GITHUB_OUTPUT
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
@ -42,7 +38,7 @@ jobs:
context: .
push: true
platforms: linux/amd64,linux/arm64
tags: tobyxdd/hysteria:latest,tobyxdd/hysteria:${{ steps.get_tag.outputs.tag }}
tags: tobyxdd/hysteria:latest,tobyxdd/hysteria:${{ steps.get_tag.outputs.TAG }}
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}

View file

@ -4,10 +4,6 @@ on:
push:
tags:
- 'v*'
branches:
- master
- main
- release
jobs:

View file

@ -13,7 +13,7 @@ tasks:
label: build-{{.TASK}}
vars:
BUILD_VERSION:
sh: git describe --tags
sh: git describe --tags --always --match 'v*'
BUILD_COMMIT:
sh: git rev-parse HEAD
BUILD_DATE:

View file

@ -67,7 +67,7 @@ if ($env:HY_APP_VERSION) {
$ldflags += " -X 'main.appVersion=$($env:HY_APP_VERSION)'"
}
else {
$ldflags += " -X 'main.appVersion=$(git describe --tags --always)'"
$ldflags += " -X 'main.appVersion=$(git describe --tags --always --match "v*")'"
}
if ($env:HY_APP_COMMIT) {
$ldflags += " -X 'main.appCommit=$($env:HY_APP_COMMIT)'"