diff --git a/cmd/server/setup.go b/cmd/server/setup.go index adaa325d3..fec1e22d1 100644 --- a/cmd/server/setup.go +++ b/cmd/server/setup.go @@ -21,8 +21,8 @@ import ( "github.com/dimfeld/httptreemux" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/plugins/environments" "github.com/woodpecker-ci/woodpecker/server/plugins/registry" "github.com/woodpecker-ci/woodpecker/server/plugins/secrets" diff --git a/server/api/badge.go b/server/api/badge.go index 701277103..fa7a3fc82 100644 --- a/server/api/badge.go +++ b/server/api/badge.go @@ -23,8 +23,8 @@ import ( "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store" ) diff --git a/server/api/build.go b/server/api/build.go index 658e63704..fbacdb8e2 100644 --- a/server/api/build.go +++ b/server/api/build.go @@ -29,8 +29,8 @@ import ( "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/queue" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" diff --git a/server/api/hook.go b/server/api/hook.go index b47f4ff56..d34ce5091 100644 --- a/server/api/hook.go +++ b/server/api/hook.go @@ -31,7 +31,7 @@ import ( "github.com/gin-gonic/gin" "github.com/sirupsen/logrus" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/shared/token" "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml" diff --git a/server/api/login.go b/server/api/login.go index 9f4e3b0e1..952b5bffd 100644 --- a/server/api/login.go +++ b/server/api/login.go @@ -20,8 +20,8 @@ import ( "time" "github.com/gorilla/securecookie" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/store" "github.com/woodpecker-ci/woodpecker/shared/httputil" diff --git a/server/api/registry.go b/server/api/registry.go index 90a1f2028..0c48a1af3 100644 --- a/server/api/registry.go +++ b/server/api/registry.go @@ -17,8 +17,8 @@ package api import ( "net/http" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/gin-gonic/gin" diff --git a/server/api/repo.go b/server/api/repo.go index 028195bed..19c036958 100644 --- a/server/api/repo.go +++ b/server/api/repo.go @@ -23,8 +23,8 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server/store" diff --git a/server/api/secret.go b/server/api/secret.go index c55532384..2b9fcfe1c 100644 --- a/server/api/secret.go +++ b/server/api/secret.go @@ -17,8 +17,8 @@ package api import ( "net/http" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/gin-gonic/gin" diff --git a/server/api/stream.go b/server/api/stream.go index 1a5b5e9d7..42509f866 100644 --- a/server/api/stream.go +++ b/server/api/stream.go @@ -22,9 +22,9 @@ import ( "strconv" "time" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/logging" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/pubsub" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server/store" diff --git a/server/api/user.go b/server/api/user.go index 574e3a549..29f43687f 100644 --- a/server/api/user.go +++ b/server/api/user.go @@ -24,7 +24,7 @@ import ( "github.com/gorilla/securecookie" "github.com/sirupsen/logrus" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server/shared" diff --git a/server/api/users.go b/server/api/users.go index 99c51b73c..52499be33 100644 --- a/server/api/users.go +++ b/server/api/users.go @@ -21,7 +21,7 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store" ) diff --git a/server/config.go b/server/config.go index d1b63344e..7a5359c00 100644 --- a/server/config.go +++ b/server/config.go @@ -20,8 +20,8 @@ package server import ( "time" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server/logging" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/pubsub" "github.com/woodpecker-ci/woodpecker/server/queue" ) diff --git a/server/grpc/rpc.go b/server/grpc/rpc.go index 277035672..99d707d3f 100644 --- a/server/grpc/rpc.go +++ b/server/grpc/rpc.go @@ -40,7 +40,7 @@ import ( "github.com/woodpecker-ci/woodpecker/server/queue" "github.com/woodpecker-ci/woodpecker/server/shared" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/store" diff --git a/model/build.go b/server/model/build.go similarity index 100% rename from model/build.go rename to server/model/build.go diff --git a/model/build_test.go b/server/model/build_test.go similarity index 100% rename from model/build_test.go rename to server/model/build_test.go diff --git a/model/cc.go b/server/model/cc.go similarity index 100% rename from model/cc.go rename to server/model/cc.go diff --git a/model/cc_test.go b/server/model/cc_test.go similarity index 100% rename from model/cc_test.go rename to server/model/cc_test.go diff --git a/model/config.go b/server/model/config.go similarity index 100% rename from model/config.go rename to server/model/config.go diff --git a/model/const.go b/server/model/const.go similarity index 100% rename from model/const.go rename to server/model/const.go diff --git a/model/environ.go b/server/model/environ.go similarity index 100% rename from model/environ.go rename to server/model/environ.go diff --git a/model/event.go b/server/model/event.go similarity index 100% rename from model/event.go rename to server/model/event.go diff --git a/model/feed.go b/server/model/feed.go similarity index 100% rename from model/feed.go rename to server/model/feed.go diff --git a/model/file.go b/server/model/file.go similarity index 100% rename from model/file.go rename to server/model/file.go diff --git a/model/netrc.go b/server/model/netrc.go similarity index 100% rename from model/netrc.go rename to server/model/netrc.go diff --git a/model/perm.go b/server/model/perm.go similarity index 100% rename from model/perm.go rename to server/model/perm.go diff --git a/model/proc.go b/server/model/proc.go similarity index 100% rename from model/proc.go rename to server/model/proc.go diff --git a/model/queue.go b/server/model/queue.go similarity index 100% rename from model/queue.go rename to server/model/queue.go diff --git a/model/registry.go b/server/model/registry.go similarity index 100% rename from model/registry.go rename to server/model/registry.go diff --git a/model/repo.go b/server/model/repo.go similarity index 100% rename from model/repo.go rename to server/model/repo.go diff --git a/model/resource_limit.go b/server/model/resource_limit.go similarity index 100% rename from model/resource_limit.go rename to server/model/resource_limit.go diff --git a/model/secret.go b/server/model/secret.go similarity index 100% rename from model/secret.go rename to server/model/secret.go diff --git a/model/secret_test.go b/server/model/secret_test.go similarity index 100% rename from model/secret_test.go rename to server/model/secret_test.go diff --git a/model/sender.go b/server/model/sender.go similarity index 100% rename from model/sender.go rename to server/model/sender.go diff --git a/model/settings.go b/server/model/settings.go similarity index 100% rename from model/settings.go rename to server/model/settings.go diff --git a/model/team.go b/server/model/team.go similarity index 100% rename from model/team.go rename to server/model/team.go diff --git a/model/user.go b/server/model/user.go similarity index 100% rename from model/user.go rename to server/model/user.go diff --git a/model/user_test.go b/server/model/user_test.go similarity index 100% rename from model/user_test.go rename to server/model/user_test.go diff --git a/server/plugins/environments/filesystem.go b/server/plugins/environments/filesystem.go index c64e13a88..3a955dd76 100644 --- a/server/plugins/environments/filesystem.go +++ b/server/plugins/environments/filesystem.go @@ -1,7 +1,7 @@ package environments import ( - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "strings" ) diff --git a/server/plugins/registry/combine.go b/server/plugins/registry/combine.go index e88a96a20..f5b8ea050 100644 --- a/server/plugins/registry/combine.go +++ b/server/plugins/registry/combine.go @@ -1,7 +1,7 @@ package registry import ( - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) type combined struct { diff --git a/server/plugins/registry/db.go b/server/plugins/registry/db.go index b9b9d415f..433eecbab 100644 --- a/server/plugins/registry/db.go +++ b/server/plugins/registry/db.go @@ -1,7 +1,7 @@ package registry import ( - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) type db struct { diff --git a/server/plugins/registry/filesystem.go b/server/plugins/registry/filesystem.go index 44fa4a138..83964dae2 100644 --- a/server/plugins/registry/filesystem.go +++ b/server/plugins/registry/filesystem.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/types" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "os" "strings" ) diff --git a/server/plugins/secrets/builtin.go b/server/plugins/secrets/builtin.go index a6d57c9ea..c3852082b 100644 --- a/server/plugins/secrets/builtin.go +++ b/server/plugins/secrets/builtin.go @@ -1,7 +1,7 @@ package secrets import ( - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) type builtin struct { diff --git a/server/plugins/sender/builtin.go b/server/plugins/sender/builtin.go index 8324621ae..588f3a9a0 100644 --- a/server/plugins/sender/builtin.go +++ b/server/plugins/sender/builtin.go @@ -1,7 +1,7 @@ package sender import ( - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) type builtin struct { diff --git a/server/plugins/sender/plugin.go b/server/plugins/sender/plugin.go index 6ff32e059..aceb571c2 100644 --- a/server/plugins/sender/plugin.go +++ b/server/plugins/sender/plugin.go @@ -3,7 +3,7 @@ package sender import ( "fmt" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/plugins/internal" ) diff --git a/server/remote/bitbucket/bitbucket.go b/server/remote/bitbucket/bitbucket.go index 26361c9cb..ee131439f 100644 --- a/server/remote/bitbucket/bitbucket.go +++ b/server/remote/bitbucket/bitbucket.go @@ -19,8 +19,8 @@ import ( "net/http" "net/url" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal" diff --git a/server/remote/bitbucket/bitbucket_test.go b/server/remote/bitbucket/bitbucket_test.go index b0d8270a4..a38b183c4 100644 --- a/server/remote/bitbucket/bitbucket_test.go +++ b/server/remote/bitbucket/bitbucket_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/fixtures" "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal" diff --git a/server/remote/bitbucket/convert.go b/server/remote/bitbucket/convert.go index f2346c610..11b2d27b7 100644 --- a/server/remote/bitbucket/convert.go +++ b/server/remote/bitbucket/convert.go @@ -20,7 +20,7 @@ import ( "regexp" "strings" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal" "golang.org/x/oauth2" diff --git a/server/remote/bitbucket/convert_test.go b/server/remote/bitbucket/convert_test.go index 08b52ea13..1fcbb7b13 100644 --- a/server/remote/bitbucket/convert_test.go +++ b/server/remote/bitbucket/convert_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal" "github.com/franela/goblin" diff --git a/server/remote/bitbucket/parse.go b/server/remote/bitbucket/parse.go index 3107b98da..7d8b8240b 100644 --- a/server/remote/bitbucket/parse.go +++ b/server/remote/bitbucket/parse.go @@ -19,7 +19,7 @@ import ( "io/ioutil" "net/http" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal" ) diff --git a/server/remote/bitbucketserver/bitbucketserver.go b/server/remote/bitbucketserver/bitbucketserver.go index 97a54dc04..5413c8e61 100644 --- a/server/remote/bitbucketserver/bitbucketserver.go +++ b/server/remote/bitbucketserver/bitbucketserver.go @@ -29,7 +29,7 @@ import ( "strings" "github.com/mrjones/oauth" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal" ) diff --git a/server/remote/bitbucketserver/convert.go b/server/remote/bitbucketserver/convert.go index 9e9a33c32..e0020ab2c 100644 --- a/server/remote/bitbucketserver/convert.go +++ b/server/remote/bitbucketserver/convert.go @@ -23,7 +23,7 @@ import ( "time" "github.com/mrjones/oauth" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal" ) diff --git a/server/remote/bitbucketserver/convert_test.go b/server/remote/bitbucketserver/convert_test.go index a71b0cd18..4249a78e2 100644 --- a/server/remote/bitbucketserver/convert_test.go +++ b/server/remote/bitbucketserver/convert_test.go @@ -19,7 +19,7 @@ import ( "github.com/franela/goblin" "github.com/mrjones/oauth" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal" ) diff --git a/server/remote/bitbucketserver/internal/client.go b/server/remote/bitbucketserver/internal/client.go index 4075c492c..6faafd48a 100644 --- a/server/remote/bitbucketserver/internal/client.go +++ b/server/remote/bitbucketserver/internal/client.go @@ -27,7 +27,7 @@ import ( "github.com/mrjones/oauth" log "github.com/sirupsen/logrus" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) const ( diff --git a/server/remote/bitbucketserver/parse.go b/server/remote/bitbucketserver/parse.go index 494b5f828..852910a5a 100644 --- a/server/remote/bitbucketserver/parse.go +++ b/server/remote/bitbucketserver/parse.go @@ -17,7 +17,7 @@ package bitbucketserver import ( "encoding/json" "fmt" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal" "net/http" ) diff --git a/server/remote/coding/coding.go b/server/remote/coding/coding.go index 5d6a555dc..e22ba15a6 100644 --- a/server/remote/coding/coding.go +++ b/server/remote/coding/coding.go @@ -20,8 +20,8 @@ import ( "net/http" "strings" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/remote/coding/internal" diff --git a/server/remote/coding/coding_test.go b/server/remote/coding/coding_test.go index df7840507..133b6ba34 100644 --- a/server/remote/coding/coding_test.go +++ b/server/remote/coding/coding_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/coding/fixtures" "github.com/franela/goblin" diff --git a/server/remote/coding/hook.go b/server/remote/coding/hook.go index 0a3704635..f04c3b372 100644 --- a/server/remote/coding/hook.go +++ b/server/remote/coding/hook.go @@ -22,7 +22,7 @@ import ( "regexp" "strings" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) const ( diff --git a/server/remote/coding/hook_test.go b/server/remote/coding/hook_test.go index dd039d32a..2d61f8293 100644 --- a/server/remote/coding/hook_test.go +++ b/server/remote/coding/hook_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/coding/fixtures" "github.com/franela/goblin" diff --git a/server/remote/gerrit/gerrit.go b/server/remote/gerrit/gerrit.go index ec6387282..1d68f470d 100644 --- a/server/remote/gerrit/gerrit.go +++ b/server/remote/gerrit/gerrit.go @@ -20,7 +20,7 @@ import ( "net/http" "net/url" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" ) diff --git a/server/remote/gitea/gitea.go b/server/remote/gitea/gitea.go index 85685e33b..483319ee5 100644 --- a/server/remote/gitea/gitea.go +++ b/server/remote/gitea/gitea.go @@ -28,8 +28,8 @@ import ( "path/filepath" "code.gitea.io/sdk/gitea" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "golang.org/x/oauth2" diff --git a/server/remote/gitea/gitea_test.go b/server/remote/gitea/gitea_test.go index 77917e162..e24e42d48 100644 --- a/server/remote/gitea/gitea_test.go +++ b/server/remote/gitea/gitea_test.go @@ -20,7 +20,7 @@ import ( "github.com/franela/goblin" "github.com/gin-gonic/gin" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/gitea/fixtures" ) diff --git a/server/remote/gitea/helper.go b/server/remote/gitea/helper.go index 7927bead6..6d04c2c0a 100644 --- a/server/remote/gitea/helper.go +++ b/server/remote/gitea/helper.go @@ -23,7 +23,7 @@ import ( "time" "code.gitea.io/sdk/gitea" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) // helper function that converts a Gitea repository to a Drone repository. diff --git a/server/remote/gitea/helper_test.go b/server/remote/gitea/helper_test.go index 96d05a127..8cfc045c4 100644 --- a/server/remote/gitea/helper_test.go +++ b/server/remote/gitea/helper_test.go @@ -20,7 +20,7 @@ import ( "code.gitea.io/sdk/gitea" "github.com/franela/goblin" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/gitea/fixtures" ) diff --git a/server/remote/gitea/parse.go b/server/remote/gitea/parse.go index 7444a0eff..f00fabda8 100644 --- a/server/remote/gitea/parse.go +++ b/server/remote/gitea/parse.go @@ -19,7 +19,7 @@ import ( "net/http" "strings" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) const ( diff --git a/server/remote/gitea/parse_test.go b/server/remote/gitea/parse_test.go index d4a2e24ae..049b28bf5 100644 --- a/server/remote/gitea/parse_test.go +++ b/server/remote/gitea/parse_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/franela/goblin" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/gitea/fixtures" ) diff --git a/server/remote/github/convert.go b/server/remote/github/convert.go index ca810178c..06ab6fa48 100644 --- a/server/remote/github/convert.go +++ b/server/remote/github/convert.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/google/go-github/github" ) diff --git a/server/remote/github/convert_test.go b/server/remote/github/convert_test.go index 862082898..e4550607e 100644 --- a/server/remote/github/convert_test.go +++ b/server/remote/github/convert_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/google/go-github/github" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/franela/goblin" ) diff --git a/server/remote/github/github.go b/server/remote/github/github.go index 1634a4a95..ae5274198 100644 --- a/server/remote/github/github.go +++ b/server/remote/github/github.go @@ -24,8 +24,8 @@ import ( "strconv" "strings" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/google/go-github/github" diff --git a/server/remote/github/github_test.go b/server/remote/github/github_test.go index 3119d4f0b..e6edda99a 100644 --- a/server/remote/github/github_test.go +++ b/server/remote/github/github_test.go @@ -18,7 +18,7 @@ import ( "net/http/httptest" "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/github/fixtures" "github.com/franela/goblin" diff --git a/server/remote/github/parse.go b/server/remote/github/parse.go index 0d564aa0e..2f512fc93 100644 --- a/server/remote/github/parse.go +++ b/server/remote/github/parse.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "net/http" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) const ( diff --git a/server/remote/github/parse_test.go b/server/remote/github/parse_test.go index db2d8edcb..ab0077498 100644 --- a/server/remote/github/parse_test.go +++ b/server/remote/github/parse_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/franela/goblin" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/github/fixtures" ) diff --git a/server/remote/gitlab/gitlab.go b/server/remote/gitlab/gitlab.go index 968492121..32737fcd6 100644 --- a/server/remote/gitlab/gitlab.go +++ b/server/remote/gitlab/gitlab.go @@ -24,8 +24,8 @@ import ( "strconv" "strings" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/shared/oauth2" diff --git a/server/remote/gitlab/gitlab_test.go b/server/remote/gitlab/gitlab_test.go index effd49713..8bcfb9a6e 100644 --- a/server/remote/gitlab/gitlab_test.go +++ b/server/remote/gitlab/gitlab_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/franela/goblin" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/gitlab/testdata" ) diff --git a/server/remote/gitlab3/gitlab.go b/server/remote/gitlab3/gitlab.go index 19b4579a2..d747827a2 100644 --- a/server/remote/gitlab3/gitlab.go +++ b/server/remote/gitlab3/gitlab.go @@ -24,8 +24,8 @@ import ( "strconv" "strings" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/shared/oauth2" diff --git a/server/remote/gitlab3/gitlab_test.go b/server/remote/gitlab3/gitlab_test.go index a7a955b5e..a181f05e9 100644 --- a/server/remote/gitlab3/gitlab_test.go +++ b/server/remote/gitlab3/gitlab_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/franela/goblin" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/gitlab3/testdata" ) diff --git a/server/remote/gogs/gogs.go b/server/remote/gogs/gogs.go index deeee7b7d..2a96fb3fb 100644 --- a/server/remote/gogs/gogs.go +++ b/server/remote/gogs/gogs.go @@ -23,7 +23,7 @@ import ( "strings" "github.com/gogits/go-gogs-client" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" ) diff --git a/server/remote/gogs/gogs_test.go b/server/remote/gogs/gogs_test.go index a648b9fbb..4076b9d4d 100644 --- a/server/remote/gogs/gogs_test.go +++ b/server/remote/gogs/gogs_test.go @@ -18,7 +18,7 @@ import ( "net/http/httptest" "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/gogs/fixtures" "github.com/franela/goblin" diff --git a/server/remote/gogs/helper.go b/server/remote/gogs/helper.go index ded5e31ff..9e60d90f6 100644 --- a/server/remote/gogs/helper.go +++ b/server/remote/gogs/helper.go @@ -23,7 +23,7 @@ import ( "time" "github.com/gogits/go-gogs-client" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) // helper function that converts a Gogs repository to a Drone repository. diff --git a/server/remote/gogs/helper_test.go b/server/remote/gogs/helper_test.go index 644debf26..884167adf 100644 --- a/server/remote/gogs/helper_test.go +++ b/server/remote/gogs/helper_test.go @@ -18,7 +18,7 @@ import ( "bytes" "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote/gogs/fixtures" "github.com/franela/goblin" diff --git a/server/remote/gogs/parse.go b/server/remote/gogs/parse.go index 3836fa61b..4139b28b0 100644 --- a/server/remote/gogs/parse.go +++ b/server/remote/gogs/parse.go @@ -18,7 +18,7 @@ import ( "io" "net/http" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) const ( diff --git a/server/remote/mocks/Remote.go b/server/remote/mocks/Remote.go index 1c532bb3e..bfcac213f 100644 --- a/server/remote/mocks/Remote.go +++ b/server/remote/mocks/Remote.go @@ -6,7 +6,7 @@ import ( http "net/http" mock "github.com/stretchr/testify/mock" - model "github.com/woodpecker-ci/woodpecker/model" + model "github.com/woodpecker-ci/woodpecker/server/model" remote "github.com/woodpecker-ci/woodpecker/server/remote" ) diff --git a/server/remote/remote.go b/server/remote/remote.go index 6e8f19f7d..b401aa7e1 100644 --- a/server/remote/remote.go +++ b/server/remote/remote.go @@ -19,7 +19,7 @@ package remote import ( "net/http" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "golang.org/x/net/context" ) diff --git a/server/router/middleware/config.go b/server/router/middleware/config.go index 60a5da2f6..631304711 100644 --- a/server/router/middleware/config.go +++ b/server/router/middleware/config.go @@ -15,7 +15,7 @@ package middleware import ( - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/gin-gonic/gin" "github.com/urfave/cli" diff --git a/server/router/middleware/session/repo.go b/server/router/middleware/session/repo.go index cd18668b5..7ba588a17 100644 --- a/server/router/middleware/session/repo.go +++ b/server/router/middleware/session/repo.go @@ -18,7 +18,7 @@ import ( "net/http" "time" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/store" diff --git a/server/router/middleware/session/user.go b/server/router/middleware/session/user.go index 64aa9f471..659444bb0 100644 --- a/server/router/middleware/session/user.go +++ b/server/router/middleware/session/user.go @@ -17,7 +17,7 @@ package session import ( "net/http" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store" "github.com/woodpecker-ci/woodpecker/shared/token" diff --git a/server/shared/buildStatus.go b/server/shared/buildStatus.go index b7716ffcc..8172e497c 100644 --- a/server/shared/buildStatus.go +++ b/server/shared/buildStatus.go @@ -17,7 +17,7 @@ package shared import ( "time" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) type UpdateBuildStore interface { diff --git a/server/shared/buildStatus_test.go b/server/shared/buildStatus_test.go index a2d5c203b..5b07e43b3 100644 --- a/server/shared/buildStatus_test.go +++ b/server/shared/buildStatus_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) type mockUpdateBuildStore struct { diff --git a/server/shared/configFetcher.go b/server/shared/configFetcher.go index b2a6a5f88..ce75c4518 100644 --- a/server/shared/configFetcher.go +++ b/server/shared/configFetcher.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" ) diff --git a/server/shared/configFetcher_test.go b/server/shared/configFetcher_test.go index effbafc7c..26f3b5722 100644 --- a/server/shared/configFetcher_test.go +++ b/server/shared/configFetcher_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/remote/mocks" "github.com/woodpecker-ci/woodpecker/server/shared" diff --git a/server/shared/procBuilder.go b/server/shared/procBuilder.go index b71077919..5f56e2be5 100644 --- a/server/shared/procBuilder.go +++ b/server/shared/procBuilder.go @@ -23,7 +23,6 @@ import ( "strings" "github.com/drone/envsubst" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/pipeline/backend" "github.com/woodpecker-ci/woodpecker/pipeline/frontend" "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml" @@ -31,6 +30,7 @@ import ( "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/linter" "github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/matrix" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" ) diff --git a/server/shared/procBuilder_test.go b/server/shared/procBuilder_test.go index 6eaca64ef..a48a6e3d6 100644 --- a/server/shared/procBuilder_test.go +++ b/server/shared/procBuilder_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" ) diff --git a/server/shared/procStatus.go b/server/shared/procStatus.go index f9a0703c4..aac73ae2f 100644 --- a/server/shared/procStatus.go +++ b/server/shared/procStatus.go @@ -17,8 +17,8 @@ package shared import ( "time" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/pipeline/rpc" + "github.com/woodpecker-ci/woodpecker/server/model" ) type UpdateProcStore interface { diff --git a/server/shared/procStatus_test.go b/server/shared/procStatus_test.go index 6d238a17d..15b4d37e9 100644 --- a/server/shared/procStatus_test.go +++ b/server/shared/procStatus_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/pipeline/rpc" + "github.com/woodpecker-ci/woodpecker/server/model" ) type mockUpdateProcStore struct { diff --git a/server/shared/userSyncer.go b/server/shared/userSyncer.go index ec4e91f56..d1ef807f0 100644 --- a/server/shared/userSyncer.go +++ b/server/shared/userSyncer.go @@ -17,7 +17,7 @@ package shared import ( "time" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/store" ) diff --git a/server/store/datastore/builds.go b/server/store/datastore/builds.go index a9ee44c54..3cdbc6024 100644 --- a/server/store/datastore/builds.go +++ b/server/store/datastore/builds.go @@ -19,7 +19,7 @@ import ( "time" "github.com/russross/meddler" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" ) diff --git a/server/store/datastore/builds_test.go b/server/store/datastore/builds_test.go index 5349b629a..a3e5c786f 100644 --- a/server/store/datastore/builds_test.go +++ b/server/store/datastore/builds_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/franela/goblin" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestBuilds(t *testing.T) { diff --git a/server/store/datastore/config.go b/server/store/datastore/config.go index 88c72a0e9..32fc90e03 100644 --- a/server/store/datastore/config.go +++ b/server/store/datastore/config.go @@ -18,7 +18,7 @@ import ( gosql "database/sql" "github.com/russross/meddler" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" ) diff --git a/server/store/datastore/config_test.go b/server/store/datastore/config_test.go index 965d18e39..a7c2c7a23 100644 --- a/server/store/datastore/config_test.go +++ b/server/store/datastore/config_test.go @@ -17,7 +17,7 @@ package datastore import ( "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestConfig(t *testing.T) { diff --git a/server/store/datastore/files.go b/server/store/datastore/files.go index 034d88f1e..185ee12f5 100644 --- a/server/store/datastore/files.go +++ b/server/store/datastore/files.go @@ -19,7 +19,7 @@ import ( "io" "io/ioutil" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" "github.com/russross/meddler" diff --git a/server/store/datastore/files_test.go b/server/store/datastore/files_test.go index 422ba00d9..9b3bab3e5 100644 --- a/server/store/datastore/files_test.go +++ b/server/store/datastore/files_test.go @@ -19,7 +19,7 @@ import ( "io/ioutil" "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestFileFind(t *testing.T) { diff --git a/server/store/datastore/logs.go b/server/store/datastore/logs.go index 1070ceb5d..af23fdcf6 100644 --- a/server/store/datastore/logs.go +++ b/server/store/datastore/logs.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "github.com/russross/meddler" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" ) diff --git a/server/store/datastore/logs_test.go b/server/store/datastore/logs_test.go index fc2148a72..611f5c4af 100644 --- a/server/store/datastore/logs_test.go +++ b/server/store/datastore/logs_test.go @@ -19,7 +19,7 @@ import ( "io/ioutil" "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestLogCreateFind(t *testing.T) { diff --git a/server/store/datastore/perms.go b/server/store/datastore/perms.go index 26193f992..45d1d42f6 100644 --- a/server/store/datastore/perms.go +++ b/server/store/datastore/perms.go @@ -15,7 +15,7 @@ package datastore import ( - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" "github.com/russross/meddler" diff --git a/server/store/datastore/perms_test.go b/server/store/datastore/perms_test.go index f6d1a5e72..80204d4d7 100644 --- a/server/store/datastore/perms_test.go +++ b/server/store/datastore/perms_test.go @@ -17,7 +17,7 @@ package datastore import ( "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestPermFind(t *testing.T) { diff --git a/server/store/datastore/procs.go b/server/store/datastore/procs.go index 7d20996d4..9ee3f996f 100644 --- a/server/store/datastore/procs.go +++ b/server/store/datastore/procs.go @@ -16,7 +16,7 @@ package datastore import ( "github.com/russross/meddler" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" ) diff --git a/server/store/datastore/procs_test.go b/server/store/datastore/procs_test.go index 35298c795..e7080d6e7 100644 --- a/server/store/datastore/procs_test.go +++ b/server/store/datastore/procs_test.go @@ -17,7 +17,7 @@ package datastore import ( "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestProcFind(t *testing.T) { diff --git a/server/store/datastore/registry.go b/server/store/datastore/registry.go index a8365f4f4..659699e77 100644 --- a/server/store/datastore/registry.go +++ b/server/store/datastore/registry.go @@ -16,7 +16,7 @@ package datastore import ( "github.com/russross/meddler" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" ) diff --git a/server/store/datastore/registry_test.go b/server/store/datastore/registry_test.go index 7f36be216..12a4588ca 100644 --- a/server/store/datastore/registry_test.go +++ b/server/store/datastore/registry_test.go @@ -17,7 +17,7 @@ package datastore import ( "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestRegistryFind(t *testing.T) { diff --git a/server/store/datastore/repos.go b/server/store/datastore/repos.go index 033d42c44..d6a4f9bbe 100644 --- a/server/store/datastore/repos.go +++ b/server/store/datastore/repos.go @@ -16,7 +16,7 @@ package datastore import ( "github.com/russross/meddler" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" ) diff --git a/server/store/datastore/repos_test.go b/server/store/datastore/repos_test.go index 6c02bdebb..0bae25386 100644 --- a/server/store/datastore/repos_test.go +++ b/server/store/datastore/repos_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/franela/goblin" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestRepos(t *testing.T) { diff --git a/server/store/datastore/secret.go b/server/store/datastore/secret.go index 1367edf5d..c19bfbae9 100644 --- a/server/store/datastore/secret.go +++ b/server/store/datastore/secret.go @@ -16,7 +16,7 @@ package datastore import ( "github.com/russross/meddler" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" ) diff --git a/server/store/datastore/secret_test.go b/server/store/datastore/secret_test.go index 259f37421..9389b55ab 100644 --- a/server/store/datastore/secret_test.go +++ b/server/store/datastore/secret_test.go @@ -17,7 +17,7 @@ package datastore import ( "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestSecretFind(t *testing.T) { diff --git a/server/store/datastore/sender.go b/server/store/datastore/sender.go index af42422da..279f3b158 100644 --- a/server/store/datastore/sender.go +++ b/server/store/datastore/sender.go @@ -16,7 +16,7 @@ package datastore import ( "github.com/russross/meddler" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" ) diff --git a/server/store/datastore/sender_test.go b/server/store/datastore/sender_test.go index 1910f1090..7e96db60c 100644 --- a/server/store/datastore/sender_test.go +++ b/server/store/datastore/sender_test.go @@ -17,7 +17,7 @@ package datastore import ( "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestSenderFind(t *testing.T) { diff --git a/server/store/datastore/task.go b/server/store/datastore/task.go index 872eaa744..db8f901e6 100644 --- a/server/store/datastore/task.go +++ b/server/store/datastore/task.go @@ -16,7 +16,7 @@ package datastore import ( "github.com/russross/meddler" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" ) diff --git a/server/store/datastore/task_test.go b/server/store/datastore/task_test.go index 5bd886df8..35f7f736c 100644 --- a/server/store/datastore/task_test.go +++ b/server/store/datastore/task_test.go @@ -17,7 +17,7 @@ package datastore import ( "testing" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestTaskList(t *testing.T) { diff --git a/server/store/datastore/users.go b/server/store/datastore/users.go index fe42850fc..7a227e5fc 100644 --- a/server/store/datastore/users.go +++ b/server/store/datastore/users.go @@ -16,7 +16,7 @@ package datastore import ( "github.com/russross/meddler" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/server/store/datastore/sql" ) diff --git a/server/store/datastore/users_test.go b/server/store/datastore/users_test.go index 79740a8d9..c0a839865 100644 --- a/server/store/datastore/users_test.go +++ b/server/store/datastore/users_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/franela/goblin" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) func TestUsers(t *testing.T) { diff --git a/server/store/store.go b/server/store/store.go index 0f3db06ac..481ea834e 100644 --- a/server/store/store.go +++ b/server/store/store.go @@ -17,7 +17,7 @@ package store import ( "io" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "golang.org/x/net/context" ) diff --git a/server/swagger/swagger.go b/server/swagger/swagger.go index 2a3791749..345f087b2 100644 --- a/server/swagger/swagger.go +++ b/server/swagger/swagger.go @@ -17,7 +17,7 @@ package swagger import ( "net/http" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" ) // swagger:route GET /users/{login} user getUser diff --git a/server/web/web.go b/server/web/web.go index a73f81eee..b76989baa 100644 --- a/server/web/web.go +++ b/server/web/web.go @@ -22,7 +22,7 @@ import ( "net/http" "time" - "github.com/woodpecker-ci/woodpecker/model" + "github.com/woodpecker-ci/woodpecker/server/model" "github.com/woodpecker-ci/woodpecker/shared/token" "github.com/woodpecker-ci/woodpecker/version" "github.com/woodpecker-ci/woodpecker/web/dist"