Skip to content
Snippets Groups Projects
Commit 37b5009a authored by Josh Brooks's avatar Josh Brooks
Browse files

Merge branch 'release' of git.xx.network:elixxir/client into hotfix/RefactorCMD

parents ea579960 45934bae
No related branches found
No related tags found
2 merge requests!510Release,!263Hotfix/refactor cmd
......@@ -120,6 +120,22 @@ bindings-android:
- bindings.aar
- bindings-sources.jar
# This pipeline job will attempt to have pkg.go.dev update docs for client/xxdk.
#
# pkg.go.dev relies on the proxy.golang.org service (go module cache/proxy) to discover versions of
# Go modules to make docs of. The proxy keeps a list of all known versions of Go modules. The go
# mod proxy does cache pulls for about 30 minutes, so if quickly successive commits are done in
# master/release, this will fail to pull the latest client, and the docs will not update.
trigger-doc-update:
stage: trigger_integration
image: $DOCKER_IMAGE
script:
# We use GOPRIVATE blank because not want to directly pull client, we want to use the public cache.
- GOPRIVATE="" go install gitlab.com/elixxir/client@$CI_COMMIT_REF_NAME
only:
- release
- master
trigger-integration:
stage: trigger_integration
trigger:
......
......@@ -16,14 +16,16 @@ import (
// Server implements the RestServer interface using connect.Connection
type Server struct {
receptionId *id.ID
endpoints *restlike.Endpoints
receptionId *id.ID
endpoints *restlike.Endpoints
ConnectServer *connect.ConnectionServer
}
// NewServer builds a RestServer with connect.Connection and
// the provided arguments, then registers necessary external services
func NewServer(identity xxdk.ReceptionIdentity, net *xxdk.Cmix,
p xxdk.E2EParams, clParams connect.ConnectionListParams) (*Server, error) {
var err error
newServer := &Server{
receptionId: identity.ID,
endpoints: restlike.NewEndpoints(),
......@@ -36,7 +38,7 @@ func NewServer(identity xxdk.ReceptionIdentity, net *xxdk.Cmix,
}
// Build the connection listener
_, err := connect.StartServer(identity, cb, net, p, clParams)
newServer.ConnectServer, err = connect.StartServer(identity, cb, net, p, clParams)
if err != nil {
return nil, err
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment