diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc4361589abe727d961b0d19baf84ab6508e8f2b..c4dc10de3ec54dfff8c212fcf76c2e6aac6965aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,4 @@
-# From: https://about.gitlab.com/2017/09/21/how-to-create-ci-cd-pipeline-with-autodeploy-to-kubernetes-using-gitlab-and-helm/
-
-variables:
- REPO_DIR: gitlab.com/elixxir
- REPO_NAME: client
- DOCKER_IMAGE: elixxirlabs/cuda-go:go1.16-cuda11.1
- MIN_CODE_COVERAGE: "35"
-
before_script:
- ##
- ## Go Setup
- ##
- go version || echo "Go executable not found."
- echo $CI_BUILD_REF
- echo $CI_PROJECT_DIR
@@ -23,12 +12,10 @@ before_script:
- git config --global url."git@$GITLAB_SERVER:".insteadOf "https://git.xx.network/"
- export PATH=$HOME/go/bin:$PATH
-
stages:
- test
- build
- trigger_integration
- - trigger_release_integration
test:
stage: test
@@ -65,9 +52,9 @@ build:
- tags
script:
- mkdir -p release
- - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' ./...
+# - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' ./...
- GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.linux64 main.go
- - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.win64 main.go
+# - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.win64 main.go
# - GOOS=windows GOARCH=386 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.win32 main.go
- GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.darwin64 main.go
- /upload-artifacts.sh release/
@@ -81,7 +68,7 @@ tag:
- master
image: $DOCKER_IMAGE
script:
- - git remote add origin_tags git@gitlab.com:elixxir/client.git || true
+ - git remote add origin_tags git@$GITLAB_SERVER:elixxir/client.git || true
- git tag $(release/client.linux64 version | grep "Elixxir Client v"| cut -d ' ' -f3) -f
- git push origin_tags -f --tags
@@ -116,22 +103,20 @@ bindings-android:
- bindings.aar
- bindings-sources.jar
-trigger_integration:
+trigger-integration:
stage: trigger_integration
- script:
- # UDB
- - "curl -X POST -F token=dcf1a672991bbc2520e96cea271b5a -F ref=master https://gitlab.com/api/v4/projects/6317316/trigger/pipeline"
- # integration
- - "curl -X POST -F token=e34aa19ef1530e579c5d590873d3c6 -F ref=master https://gitlab.com/api/v4/projects/5615854/trigger/pipeline"
+ trigger:
+ project: elixxir/integration
+ branch: $CI_COMMIT_REF_NAME
only:
- master
+ - release
-trigger_release_integration:
- stage: trigger_release_integration
- script:
- # UDB
- - "curl -X POST -F token=dcf1a672991bbc2520e96cea271b5a -F ref=release https://gitlab.com/api/v4/projects/6317316/trigger/pipeline"
- # integration
- - "curl -X POST -F token=e34aa19ef1530e579c5d590873d3c6 -F ref=release -F \"variables[CLIENT_ID]=release\" -F \"variables[GATEWAY_ID]=release\" -F \"variables[REGISTRATION_ID]=release\" -F \"variables[SERVER_ID]=release\" -F \"variables[UDB_ID]=release\" https://gitlab.com/api/v4/projects/5615854/trigger/pipeline"
+trigger-udb:
+ stage: trigger_integration
+ trigger:
+ project: elixxir/user-discovery-bot
+ branch: $CI_COMMIT_REF_NAME
only:
+ - master
- release
diff --git a/go.mod b/go.mod
index 593a8a2551829adc50805b851b1fdcc3e8e2ccc1..8cc98f544313334c3df065102406f68904d17a0d 100644
--- a/go.mod
+++ b/go.mod
@@ -17,13 +17,13 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/viper v1.7.1
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228
- gitlab.com/elixxir/comms v0.0.4-0.20210727193005-77b7208dbebb
- gitlab.com/elixxir/crypto v0.0.7-0.20210727192727-d801dea28fcf
+ gitlab.com/elixxir/comms v0.0.4-0.20210730225257-7448ef0ed300
+ gitlab.com/elixxir/crypto v0.0.7-0.20210730225011-f19fcaec9d9a
gitlab.com/elixxir/ekv v0.1.5
- gitlab.com/elixxir/primitives v0.0.3-0.20210727192608-609254eca789
- gitlab.com/xx_network/comms v0.0.4-0.20210727192538-2e78b803c7fc
- gitlab.com/xx_network/crypto v0.0.5-0.20210727192439-c1ce10d60b7e
- gitlab.com/xx_network/primitives v0.0.4-0.20210727191551-5fe750830811
+ gitlab.com/elixxir/primitives v0.0.3-0.20210730224847-0ccf9c1498dc
+ gitlab.com/xx_network/comms v0.0.4-0.20210730224818-0e18bc6c6d7f
+ gitlab.com/xx_network/crypto v0.0.5-0.20210730224718-bb82975eb741
+ gitlab.com/xx_network/primitives v0.0.4-0.20210730183715-b5fc5e89e5fb
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
google.golang.org/genproto v0.0.0-20210105202744-fe13368bc0e1 // indirect
diff --git a/go.sum b/go.sum
index 1d4fdd8fcec547d79832f17471a1c2b6efb4bab2..3c33cc2858d35cd342d449cb3678feb56d93ca74 100644
--- a/go.sum
+++ b/go.sum
@@ -251,32 +251,32 @@ github.com/zeebo/pcg v1.0.0 h1:dt+dx+HvX8g7Un32rY9XWoYnd0NmKmrIzpHF7qiTDj0=
github.com/zeebo/pcg v1.0.0/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228 h1:Gi6rj4mAlK0BJIk1HIzBVMjWNjIUfstrsXC2VqLYPcA=
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228/go.mod h1:H6jztdm0k+wEV2QGK/KYA+MY9nj9Zzatux/qIvDDv3k=
-gitlab.com/elixxir/comms v0.0.4-0.20210727193005-77b7208dbebb h1:bQHf86XcS92rJfA7go5/Nt9J+VnHwzQvXn6ZYpuSur4=
-gitlab.com/elixxir/comms v0.0.4-0.20210727193005-77b7208dbebb/go.mod h1:1OAVxmLZNseR+U8II0KU56sd1k+61oWGrMOZR8z4DaY=
+gitlab.com/elixxir/comms v0.0.4-0.20210730225257-7448ef0ed300 h1:En3LKw3SBmCdaKQOhuMr68NjI3B1vB/M3uMcR+AhymE=
+gitlab.com/elixxir/comms v0.0.4-0.20210730225257-7448ef0ed300/go.mod h1:17joJ0LOMkSUuzABBWJXGzW3d4JwwxPinpZtZp4Q+V0=
gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c=
gitlab.com/elixxir/crypto v0.0.3/go.mod h1:ZNgBOblhYToR4m8tj4cMvJ9UsJAUKq+p0gCp07WQmhA=
-gitlab.com/elixxir/crypto v0.0.7-0.20210727192727-d801dea28fcf h1:7AetXHtuTIEXPWWGS+x8Wk0xu/F7zXVE4GBOmRmjkIY=
-gitlab.com/elixxir/crypto v0.0.7-0.20210727192727-d801dea28fcf/go.mod h1:xgE3s3yop+USKLWIBII+ytrctMgUoS/RkZfiuEwFSbI=
+gitlab.com/elixxir/crypto v0.0.7-0.20210730225011-f19fcaec9d9a h1:J03ww36nesSO5GqBmcz7R/frjRuDE5xvsf5c0XnLlPk=
+gitlab.com/elixxir/crypto v0.0.7-0.20210730225011-f19fcaec9d9a/go.mod h1:dbSkBBsdawIHeK2I35kKre+u48womD+BDyPrmA5WMP8=
gitlab.com/elixxir/ekv v0.1.5 h1:R8M1PA5zRU1HVnTyrtwybdABh7gUJSCvt1JZwUSeTzk=
gitlab.com/elixxir/ekv v0.1.5/go.mod h1:e6WPUt97taFZe5PFLPb1Dupk7tqmDCTQu1kkstqJvw4=
gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg=
gitlab.com/elixxir/primitives v0.0.0-20200804170709-a1896d262cd9/go.mod h1:p0VelQda72OzoUckr1O+vPW0AiFe0nyKQ6gYcmFSuF8=
gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc=
gitlab.com/elixxir/primitives v0.0.1/go.mod h1:kNp47yPqja2lHSiS4DddTvFpB/4D9dB2YKnw5c+LJCE=
-gitlab.com/elixxir/primitives v0.0.3-0.20210727192608-609254eca789 h1:SQm9HWVatmr4Wa7n8xnBFDVpZd+MCoGobJOxhA0JhVo=
-gitlab.com/elixxir/primitives v0.0.3-0.20210727192608-609254eca789/go.mod h1:LiBXRxrYQBPty77ZZJj7ZQ9rULvf2ApFmDdkBwyrgUU=
+gitlab.com/elixxir/primitives v0.0.3-0.20210730224847-0ccf9c1498dc h1:JKLbpuolmL2AchvazdniALzBUBesbQg1fxooisA25oM=
+gitlab.com/elixxir/primitives v0.0.3-0.20210730224847-0ccf9c1498dc/go.mod h1:aSiku85Et4ZFImz+BGlGTPL0uyisuioYI7n9kwV63Rk=
gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw=
-gitlab.com/xx_network/comms v0.0.4-0.20210727192538-2e78b803c7fc h1:3LMPRzMfXJcAH3wzNLybWiLKRn1O7lueEqNi2paWNfM=
-gitlab.com/xx_network/comms v0.0.4-0.20210727192538-2e78b803c7fc/go.mod h1:Il4wKI2gnxTisIvxpvwr4aMoSVTrNymF+QdR7scv0m4=
+gitlab.com/xx_network/comms v0.0.4-0.20210730224818-0e18bc6c6d7f h1:6zRyGth44hqX8LXyL3WMB39jXMgf5/E+mNRrifP7zKo=
+gitlab.com/xx_network/comms v0.0.4-0.20210730224818-0e18bc6c6d7f/go.mod h1:6FAlfvD2XVQROqpJ8FHZXhRcZucbosJWWtkvtjWJQeg=
gitlab.com/xx_network/crypto v0.0.3/go.mod h1:DF2HYvvCw9wkBybXcXAgQMzX+MiGbFPjwt3t17VRqRE=
gitlab.com/xx_network/crypto v0.0.4/go.mod h1:+lcQEy+Th4eswFgQDwT0EXKp4AXrlubxalwQFH5O0Mk=
-gitlab.com/xx_network/crypto v0.0.5-0.20210727192439-c1ce10d60b7e h1:+ENYcJxrjb5ZWI5YdbXtq9O9OLf1rxB3g9bVXiqdIpI=
-gitlab.com/xx_network/crypto v0.0.5-0.20210727192439-c1ce10d60b7e/go.mod h1:PPqJYbJ4dSQWWEVIhoUaMneMPoBAnWwaU7C7I20JZWk=
+gitlab.com/xx_network/crypto v0.0.5-0.20210730224718-bb82975eb741 h1:+36mlyY2HOuiB5Q/pHa6V2owQc/ZKud1Fv7VihxTVXI=
+gitlab.com/xx_network/crypto v0.0.5-0.20210730224718-bb82975eb741/go.mod h1:jbr6dDUqe5CrPHrhRMeGQzcDhjiKwLRImTJHzewPyvE=
gitlab.com/xx_network/primitives v0.0.0-20200803231956-9b192c57ea7c/go.mod h1:wtdCMr7DPePz9qwctNoAUzZtbOSHSedcK++3Df3psjA=
gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da/go.mod h1:OK9xevzWCaPO7b1wiluVJGk7R5ZsuC7pHY5hteZFQug=
gitlab.com/xx_network/primitives v0.0.2/go.mod h1:cs0QlFpdMDI6lAo61lDRH2JZz+3aVkHy+QogOB6F/qc=
-gitlab.com/xx_network/primitives v0.0.4-0.20210727191551-5fe750830811 h1:DCiA0ohdWaTzVGGoW27B/HGI1ziIDwfeArV0xXG2o/g=
-gitlab.com/xx_network/primitives v0.0.4-0.20210727191551-5fe750830811/go.mod h1:9imZHvYwNFobxueSvVtHneZLk9wTK7HQTzxPm+zhFhE=
+gitlab.com/xx_network/primitives v0.0.4-0.20210730183715-b5fc5e89e5fb h1:/sMTpBe+AxS6kKN0riiWmbqfkn4V6K85IN4b9OHsF4o=
+gitlab.com/xx_network/primitives v0.0.4-0.20210730183715-b5fc5e89e5fb/go.mod h1:9imZHvYwNFobxueSvVtHneZLk9wTK7HQTzxPm+zhFhE=
gitlab.com/xx_network/ring v0.0.3-0.20210527191221-ce3f170aabd5 h1:FY+4Rh1Q2rgLyv10aKJjhWApuKRCR/054XhreudfAvw=
gitlab.com/xx_network/ring v0.0.3-0.20210527191221-ce3f170aabd5/go.mod h1:aLzpP2TiZTQut/PVHR40EJAomzugDdHXetbieRClXIM=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=