Compare commits

...

1 Commits

Author SHA1 Message Date
dkeven
c8150a6d76 fix(cli): do not override upgrade target version by config file 2026-02-04 15:39:38 +08:00
2 changed files with 6 additions and 12 deletions

View File

@@ -30,13 +30,7 @@ func UpgradeOlaresPipeline() error {
return fmt.Errorf("error parsing current Olares version: %v", err)
}
// should only be and defaults to the current cli version
// this argument is for backwards-compatibility with older olaresd
targetVersionStr := viper.GetString(common.FlagVersion)
if targetVersionStr == "" {
targetVersionStr = version.VERSION
}
targetVersion, err := utils.ParseOlaresVersionString(targetVersionStr)
targetVersion, err := utils.ParseOlaresVersionString(version.VERSION)
if err != nil {
return fmt.Errorf("error parsing target Olares version: %v", err)
}

View File

@@ -7,15 +7,15 @@ import (
"github.com/beclab/Olares/cli/pkg/core/task"
)
type upgrader_1_12_6_20260122 struct {
type upgrader_1_12_5_20260122 struct {
breakingUpgraderBase
}
func (u upgrader_1_12_6_20260122) Version() *semver.Version {
return semver.MustParse("1.12.6-20260122")
func (u upgrader_1_12_5_20260122) Version() *semver.Version {
return semver.MustParse("1.12.5-20260122")
}
func (u upgrader_1_12_6_20260122) UpgradeSystemComponents() []task.Interface {
func (u upgrader_1_12_5_20260122) UpgradeSystemComponents() []task.Interface {
pre := []task.Interface{
&task.LocalTask{
Name: "UpgradeL4BFLProxy",
@@ -28,5 +28,5 @@ func (u upgrader_1_12_6_20260122) UpgradeSystemComponents() []task.Interface {
}
func init() {
registerDailyUpgrader(upgrader_1_12_6_20260122{})
registerDailyUpgrader(upgrader_1_12_5_20260122{})
}