mirror of
https://github.com/apernet/hysteria.git
synced 2025-04-03 20:47:38 +03:00
ci: fix build scripts to handle multi-tags
This commit is contained in:
parent
7430f37b21
commit
dd4c17972f
4 changed files with 9 additions and 17 deletions
8
.github/workflows/release-docker.yaml
vendored
8
.github/workflows/release-docker.yaml
vendored
|
@ -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 }}
|
||||
|
|
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
|
@ -4,10 +4,6 @@ on:
|
|||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
- release
|
||||
|
||||
jobs:
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
12
build.ps1
12
build.ps1
|
@ -9,20 +9,20 @@ function PlatformToEnv($os, $arch) {
|
|||
$env:CGO_ENABLED = 0
|
||||
$env:GOOS = $os
|
||||
$env:GOARCH = $arch
|
||||
|
||||
|
||||
switch -Regex ($arch) {
|
||||
"arm" {
|
||||
"arm" {
|
||||
$env:GOARM = "7"
|
||||
}
|
||||
"armv5" {
|
||||
"armv5" {
|
||||
$env:GOARM = "5"
|
||||
$env:GOARCH = "arm"
|
||||
}
|
||||
"armv6" {
|
||||
"armv6" {
|
||||
$env:GOARM = "6"
|
||||
$env:GOARCH = "arm"
|
||||
}
|
||||
"armv7" {
|
||||
"armv7" {
|
||||
$env:GOARM = "7"
|
||||
$env:GOARCH = "arm"
|
||||
}
|
||||
|
@ -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)'"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue