mirror of https://github.com/Xhofe/alist
fix(workflow): use the dev version of the web for beta releases (#7862)
* fix(workflow): use dev version of the web for beta releases * chore(config): check version string by prefixpull/7080/merge
parent
11b6a6012f
commit
c2633dd443
|
@ -52,7 +52,12 @@ jobs:
|
||||||
if: steps.cache-musl.outputs.cache-hit != 'true'
|
if: steps.cache-musl.outputs.cache-hit != 'true'
|
||||||
run: bash build.sh prepare docker-multiplatform
|
run: bash build.sh prepare docker-multiplatform
|
||||||
|
|
||||||
- name: Build go binary
|
- name: Build go binary (beta)
|
||||||
|
if: env.IMAGE_IS_PROD != 'true'
|
||||||
|
run: bash build.sh beta docker-multiplatform
|
||||||
|
|
||||||
|
- name: Build go binary (release)
|
||||||
|
if: env.IMAGE_IS_PROD == 'true'
|
||||||
run: bash build.sh release docker-multiplatform
|
run: bash build.sh release docker-multiplatform
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
|
|
11
build.sh
11
build.sh
|
@ -7,6 +7,9 @@ gitCommit=$(git log --pretty=format:"%h" -1)
|
||||||
if [ "$1" = "dev" ]; then
|
if [ "$1" = "dev" ]; then
|
||||||
version="dev"
|
version="dev"
|
||||||
webVersion="dev"
|
webVersion="dev"
|
||||||
|
elif [ "$1" = "beta" ]; then
|
||||||
|
version="beta"
|
||||||
|
webVersion="dev"
|
||||||
else
|
else
|
||||||
git tag -d beta
|
git tag -d beta
|
||||||
version=$(git describe --abbrev=0 --tags)
|
version=$(git describe --abbrev=0 --tags)
|
||||||
|
@ -301,8 +304,12 @@ if [ "$1" = "dev" ]; then
|
||||||
else
|
else
|
||||||
BuildDev
|
BuildDev
|
||||||
fi
|
fi
|
||||||
elif [ "$1" = "release" ]; then
|
elif [ "$1" = "release" -o "$1" = "beta" ]; then
|
||||||
FetchWebRelease
|
if [ "$1" = "beta" ]; then
|
||||||
|
FetchWebDev
|
||||||
|
else
|
||||||
|
FetchWebRelease
|
||||||
|
fi
|
||||||
if [ "$2" = "docker" ]; then
|
if [ "$2" = "docker" ]; then
|
||||||
BuildDocker
|
BuildDocker
|
||||||
elif [ "$2" = "docker-multiplatform" ]; then
|
elif [ "$2" = "docker-multiplatform" ]; then
|
||||||
|
|
|
@ -50,7 +50,7 @@ func InitConfig() {
|
||||||
log.Fatalf("load config error: %+v", err)
|
log.Fatalf("load config error: %+v", err)
|
||||||
}
|
}
|
||||||
LastLaunchedVersion = conf.Conf.LastLaunchedVersion
|
LastLaunchedVersion = conf.Conf.LastLaunchedVersion
|
||||||
if conf.Version != "dev" || LastLaunchedVersion == "" {
|
if strings.HasPrefix(conf.Version, "v") || LastLaunchedVersion == "" {
|
||||||
conf.Conf.LastLaunchedVersion = conf.Version
|
conf.Conf.LastLaunchedVersion = conf.Version
|
||||||
}
|
}
|
||||||
// update config.json struct
|
// update config.json struct
|
||||||
|
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"github.com/alist-org/alist/v3/internal/bootstrap/patch"
|
"github.com/alist-org/alist/v3/internal/bootstrap/patch"
|
||||||
"github.com/alist-org/alist/v3/internal/conf"
|
"github.com/alist-org/alist/v3/internal/conf"
|
||||||
"github.com/alist-org/alist/v3/pkg/utils"
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
var LastLaunchedVersion = ""
|
var LastLaunchedVersion = ""
|
||||||
|
@ -38,7 +39,7 @@ func compareVersion(majorA, minorA, patchNumA, majorB, minorB, patchNumB int) bo
|
||||||
}
|
}
|
||||||
|
|
||||||
func InitUpgradePatch() {
|
func InitUpgradePatch() {
|
||||||
if conf.Version == "dev" {
|
if !strings.HasPrefix(conf.Version, "v") {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if LastLaunchedVersion == conf.Version {
|
if LastLaunchedVersion == conf.Version {
|
||||||
|
|
Loading…
Reference in New Issue