From 2947f24a9b18a6c583f72fb1ea75d4ed7ed4d639 Mon Sep 17 00:00:00 2001 From: thxCode Date: Wed, 11 Sep 2024 23:49:57 +0800 Subject: [PATCH] refactor: ignore version prefix with v Signed-off-by: thxCode --- .github/workflows/ci.yml | 6 +++--- pkg/apis/provider/handler_view.go | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39b89ef..85ea208 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: **/go.sum - name: Setup Toolbox timeout-minutes: 5 - uses: actions/cache@v3 + uses: actions/cache@v4 with: # restore/save service binaries, e.g. goimports, golangci-lint, commitsar. key: toolbox-${{ runner.os }} @@ -72,7 +72,7 @@ jobs: LINT_DIRTY: "true" PACKAGE_BUILD: "false" - name: Archive Publish Result - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: # save package resources, e.g. go build result, downloaded UI, entrypoint script. key: archive-${{ runner.os }}-${{ github.sha }} @@ -114,7 +114,7 @@ jobs: password: ${{ secrets.CI_DOCKERHUB_PASSWORD }} - name: Unarchive Publish Result timeout-minutes: 5 - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: # restore package resources, e.g. go build result, downloaded UI, entrypoint script. key: archive-${{ runner.os }}-${{ github.sha }} diff --git a/pkg/apis/provider/handler_view.go b/pkg/apis/provider/handler_view.go index 91d333d..239ee6d 100644 --- a/pkg/apis/provider/handler_view.go +++ b/pkg/apis/provider/handler_view.go @@ -3,6 +3,7 @@ package provider import ( "errors" "regexp" + "strings" "time" "github.com/gin-gonic/gin" @@ -45,7 +46,7 @@ func (r *GetMetadataRequest) Validate() error { } func (r *GetMetadataRequest) Version() string { - return r.Action[:len(r.Action)-5] + return strings.TrimPrefix(r.Action[:len(r.Action)-5], "v") } type ( @@ -84,7 +85,7 @@ func (r *DownloadArchiveRequest) Validate() error { return errors.New("invalid type") } - r.Version = ps[1] + r.Version = strings.TrimPrefix(ps[1], "v") r.OS = ps[2] r.Arch = ps[3]