From 6cb2915f191372585bf81f2bc246321931013bec Mon Sep 17 00:00:00 2001 From: "renzheng.wang" Date: Wed, 8 May 2024 07:37:36 +0800 Subject: [PATCH 1/4] update golang version in github action --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f977bfc7a..42aba2cfc3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - name: Set up go uses: actions/setup-go@v3 with: - go-version: 1.19.2 + go-version: 1.21.9 - name: Build run: go build ./... diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a55f3a9ddb..89223027d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Set up go uses: actions/setup-go@v3 with: - go-version: 1.19.3 + go-version: 1.21.9 - name: Build run: bash hack/github-release.sh From c9385b4709ad3458ac511051081b77c75c3f967b Mon Sep 17 00:00:00 2001 From: "renzheng.wang" Date: Thu, 9 May 2024 07:09:17 +0800 Subject: [PATCH 2/4] update build version --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42aba2cfc3..1f37c668c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - name: Set up go uses: actions/setup-go@v3 with: - go-version: 1.21.9 + go-version: 1.20.14 - name: Build run: go build ./... diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89223027d2..342a881bd5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Set up go uses: actions/setup-go@v3 with: - go-version: 1.21.9 + go-version: 1.20.14 - name: Build run: bash hack/github-release.sh diff --git a/go.mod b/go.mod index e08e13f1dc..2491b41754 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ucloud/ucloud-cli -go 1.21 +go 1.20 require ( github.com/fatih/color v1.13.0 From 47fccce5ee133b62f5dc85d3dcadd92fcf60e0bb Mon Sep 17 00:00:00 2001 From: "renzheng.wang" Date: Thu, 9 May 2024 07:20:50 +0800 Subject: [PATCH 3/4] remove dependency for slices package --- cmd/api.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/api.go b/cmd/api.go index 6386ff51c5..10441ad347 100644 --- a/cmd/api.go +++ b/cmd/api.go @@ -6,7 +6,6 @@ import ( "fmt" "io" "io/ioutil" - "slices" "strconv" "strings" "sync" @@ -50,7 +49,7 @@ func NewCmdAPI(out io.Writer) *cobra.Command { Short: "Call API", Long: "Call API", Run: func(c *cobra.Command, args []string) { - if slices.Contains(args, "--help") { + if containHelp(args) { fmt.Fprintln(out, HelpInfo) return } @@ -251,3 +250,12 @@ func genericInvokeRepeatWrapper(repeatsConfig *RepeatsConfig, params map[string] refresh.Do(fmt.Sprintf("finally, total:%d, success:%d, fail:%d", repeats, success.Load(), repeats-int(success.Load()))) return nil } + +func containHelp(args []string) bool { + for _, arg := range args { + if arg == "--help" { + return true + } + } + return false +} From bfc96df81a5f5bd7894957681a74d76c62621428 Mon Sep 17 00:00:00 2001 From: "renzheng.wang" Date: Thu, 9 May 2024 07:25:12 +0800 Subject: [PATCH 4/4] update golang build env version --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f37c668c9..6f977bfc7a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - name: Set up go uses: actions/setup-go@v3 with: - go-version: 1.20.14 + go-version: 1.19.2 - name: Build run: go build ./... diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 342a881bd5..7dcba83bfe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Set up go uses: actions/setup-go@v3 with: - go-version: 1.20.14 + go-version: 1.19.2 - name: Build run: bash hack/github-release.sh diff --git a/go.mod b/go.mod index 2491b41754..95fd05f6c6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ucloud/ucloud-cli -go 1.20 +go 1.19 require ( github.com/fatih/color v1.13.0