Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
client
Commits
37b5009a
Commit
37b5009a
authored
2 years ago
by
Josh Brooks
Browse files
Options
Downloads
Plain Diff
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
!510
Release
,
!263
Hotfix/refactor cmd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+16
-0
16 additions, 0 deletions
.gitlab-ci.yml
restlike/connect/server.go
+5
-3
5 additions, 3 deletions
restlike/connect/server.go
with
21 additions
and
3 deletions
.gitlab-ci.yml
+
16
−
0
View file @
37b5009a
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
restlike/connect/server.go
+
5
−
3
View file @
37b5009a
...
...
@@ -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
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment