From 87d26fbb23bccd20f6ed5ff01ac6d22f1b31e4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Fri, 11 Oct 2024 00:58:21 +0800 Subject: [PATCH] workflow: fix download frontend --- .github/workflows/backend.yml | 2 +- .github/workflows/goreleaser.yml | 2 +- .goreleaser.yaml | 1 + internal/data/setting.go | 2 +- internal/service/cli.go | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 772b562c2..2856a4b25 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -30,7 +30,7 @@ jobs: - name: Download frontend uses: dawidd6/action-download-artifact@v6 with: - workflow: build-frontend.yml + workflow: frontend.yml name: frontend path: internal/embed/frontend check_artifacts: true diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 198e876cd..dbd08d64d 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -27,7 +27,7 @@ jobs: - name: Download frontend uses: dawidd6/action-download-artifact@v6 with: - workflow: build-frontend.yml + workflow: frontend.yml name: frontend path: internal/embed/frontend check_artifacts: true diff --git a/.goreleaser.yaml b/.goreleaser.yaml index a1e83d7d3..4981615de 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,3 +1,4 @@ +version: 2 project_name: panel builds: diff --git a/internal/data/setting.go b/internal/data/setting.go index bf61f5d1e..5b886867b 100644 --- a/internal/data/setting.go +++ b/internal/data/setting.go @@ -126,7 +126,7 @@ func (r *settingRepo) UpdatePanelSetting(ctx context.Context, setting *request.P if err != nil { return false, err } - if err = yaml.UnmarshalWithOptions([]byte(raw), &config, yaml.CommentToMap(cm)); err != nil { + if err = yaml.UnmarshalWithOptions([]byte(raw), config, yaml.CommentToMap(cm)); err != nil { return false, err } diff --git a/internal/service/cli.go b/internal/service/cli.go index b251f2967..4691b4ec2 100644 --- a/internal/service/cli.go +++ b/internal/service/cli.go @@ -298,7 +298,7 @@ func (s *CliService) Init(ctx context.Context, cmd *cli.Command) error { if err != nil { return err } - if err = yaml.UnmarshalWithOptions([]byte(raw), &config, yaml.CommentToMap(cm)); err != nil { + if err = yaml.UnmarshalWithOptions([]byte(raw), config, yaml.CommentToMap(cm)); err != nil { return err }