From 554de04fb24b2443eb984065e7295f382b80b3a4 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 18 Sep 2024 10:42:31 -0400 Subject: [PATCH 1/3] re-arrange imports --- routers/api/v1/repo/action.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index 905748bf80..f1e4389f80 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -4,18 +4,17 @@ package repo import ( + "errors" + "net/http" + "strconv" + "strings" + + "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/actions" "code.gitea.io/gitea/modules/git" - "errors" - "github.com/nektos/act/pkg/jobparser" - "github.com/nektos/act/pkg/model" - "net/http" - "strconv" - "strings" - actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" secret_model "code.gitea.io/gitea/models/secret" @@ -28,6 +27,9 @@ import ( "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/convert" secret_service "code.gitea.io/gitea/services/secrets" + + "github.com/nektos/act/pkg/jobparser" + "github.com/nektos/act/pkg/model" ) // ListActionsSecrets list an repo's actions secrets From ccfbdaf36f39212852dd5a60888c8d6fc227eafe Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 18 Sep 2024 10:43:00 -0400 Subject: [PATCH 2/3] remove extra empty line --- routers/api/v1/repo/action.go | 1 - 1 file changed, 1 deletion(-) diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index f1e4389f80..56eb11f2e1 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -8,7 +8,6 @@ import ( "net/http" "strconv" "strings" - "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" From 1fae9c8d09180591856ec4fe117dd0e876654d3e Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 18 Sep 2024 10:49:31 -0400 Subject: [PATCH 3/3] make fmt --- modules/structs/repo_actions.go | 4 ++-- routers/api/v1/repo/action.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/structs/repo_actions.go b/modules/structs/repo_actions.go index af75bbd669..c36404ada8 100644 --- a/modules/structs/repo_actions.go +++ b/modules/structs/repo_actions.go @@ -38,8 +38,8 @@ type ActionTaskResponse struct { // swagger:model CreateActionWorkflowDispatch type CreateActionWorkflowDispatch struct { // required: true - Ref string `json:"ref"` - Inputs map[string]interface{} `json:"inputs"` + Ref string `json:"ref"` + Inputs map[string]any `json:"inputs"` } // ActionWorkflow represents a ActionWorkflow diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index 56eb11f2e1..004202be40 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -8,15 +8,15 @@ import ( "net/http" "strconv" "strings" - + + actions_model "code.gitea.io/gitea/models/actions" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" + secret_model "code.gitea.io/gitea/models/secret" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/actions" "code.gitea.io/gitea/modules/git" - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - secret_model "code.gitea.io/gitea/models/secret" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web"