mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-06-27 01:30:46 +00:00
Code Issues Projects Releases Wiki Activity

Import packages only once (#2362)

Browse source 
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
This commit is contained in:
guangwu 2023-09-01 23:02:21 +08:00 committed by GitHub
parent aab7e73322
commit 287590acfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/forge/gitlab/gitlab.go
View file

@ -33,7 +33,6 @@ import (
"github.com/woodpecker-ci/woodpecker/server"
"github.com/woodpecker-ci/woodpecker/server/forge"
"github.com/woodpecker-ci/woodpecker/server/forge/common"
"github.com/woodpecker-ci/woodpecker/server/forge/types"
forge_types "github.com/woodpecker-ci/woodpecker/server/forge/types"
"github.com/woodpecker-ci/woodpecker/server/model"
"github.com/woodpecker-ci/woodpecker/server/store"
@ -620,7 +619,7 @@ func (g *GitLab) Hook(ctx context.Context, req *http.Request) (*model.Repo, *mod
case *gitlab.TagEvent:
return convertTagHook(event)
default:
return nil, nil, &types.ErrIgnoreEvent{Event: string(eventType)}
return nil, nil, &forge_types.ErrIgnoreEvent{Event: string(eventType)}
}
}

3
server/grpc/rpc.go
View file

@ -28,7 +28,6 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/rs/zerolog/log"
"google.golang.org/grpc/metadata"
grpcMetadata "google.golang.org/grpc/metadata"
"github.com/woodpecker-ci/woodpecker/pipeline/rpc"
@ -428,7 +427,7 @@ func (s *RPC) notify(c context.Context, repo *model.Repo, pipeline *model.Pipeli
}
func (s *RPC) getAgentFromContext(ctx context.Context) (*model.Agent, error) {
md, ok := metadata.FromIncomingContext(ctx)
md, ok := grpcMetadata.FromIncomingContext(ctx)
if !ok {
return nil, errors.New("metadata is not provided")
}