Latest changes

builder/build.py

@@ -9,7 +9,9 @@ import shutil
 from termcolor import colored
 
 def get_dir(path):
-    return path.split(':')[1]
+    dirp = path.split(':')[1]
+    parts = dirp.split('/')
+    return os.path.join(parts[0], parts[1])
 
 def run(cmd):
     print(" ".join(cmd))
@@ -33,6 +35,10 @@ def clone(repo):
     if not repo:
         raise("Cannot clone without repository!")
 
+    if repo.endswith('/v4'):
+        repo = repo[:-3]
+
+
     target_dir = get_dir(repo)
     os.makedirs(target_dir, exist_ok=True)
 
@@ -119,7 +125,7 @@ def update(repo, dependencies):
                 raise("Second update failure")
         if not check_changes():
             raise("bad repository state, will not update")
-        run(['go', 'mod', 'tidy', '-compat=1.17']) # go mod tidy -compat=1.17
+        run(['go', 'mod', 'tidy', '-compat=1.19']) # go mod tidy -compat=1.19
         run(['go', 'mod', 'vendor'])
         run(['make', 'release'])
         run(['go', 'build', './...'])
@@ -181,6 +187,7 @@ def mergeinto(repo, target):
         run(['git', 'pull'])
         run(['git', 'merge', target])
         run(['git', 'checkout', '--ours', 'go.mod', 'go.sum'])
+        run(['git', 'add', 'go.sum', 'go.mod'])
         run(['git', 'commit'])
         res = run(['git', 'push'])
         if res.returncode != 0:

builder/main.py

@@ -43,29 +43,33 @@ proj_conf = {
         'dependencies': ['xxprimitives', 'xxcrypto', 'xxcomms',
                          'primitives', 'crypto', 'ring', 'grpc-web-go-client'],
     },
-    # 'server': { # Note -- leaving out GPU, ekv, and others for now!
-    #     'repo': 'git@git.xx.network:elixxir/server',
-    #     'dependencies': ['xxprimitives', 'xxcrypto', 'xxcomms',
-    #                      'primitives', 'crypto', 'ring', 'comms'],
-    # },
+    'server': { # Note -- leaving out GPU, ekv, and others for now!
+        'repo': 'git@git.xx.network:elixxir/server',
+        'dependencies': ['xxprimitives', 'xxcrypto', 'xxcomms',
+                         'primitives', 'crypto', 'ring', 'comms',
+                         'grpc-web-go-client'],
+    },
     'permissioning': {
         'repo': 'git@git.xx.network:elixxir/registration',
         'dependencies': ['xxprimitives', 'xxcrypto', 'xxcomms',
-                         'primitives', 'crypto', 'ring', 'comms'],
+                         'primitives', 'crypto', 'ring', 'comms',
+                         'grpc-web-go-client'],
     },
     'client-registrar': {
         'repo': 'git@git.xx.network:elixxir/client-registrar',
         'dependencies': ['xxprimitives', 'xxcrypto', 'xxcomms',
                          'primitives', 'crypto', 'ring', 'comms',
-                         'permissioning'],
+                         'permissioning',
+                         'grpc-web-go-client'],
     },
     'gateway': {
         'repo': 'git@git.xx.network:elixxir/gateway',
         'dependencies': ['xxprimitives', 'xxcrypto', 'xxcomms',
-                         'primitives', 'crypto', 'ring', 'comms'],
+                         'primitives', 'crypto', 'ring', 'comms',
+                         'grpc-web-go-client'],
     },
     'client': {
-        'repo': 'git@git.xx.network:elixxir/client',
+        'repo': 'git@git.xx.network:elixxir/client/v4',
         'dependencies': ['xxprimitives', 'xxcrypto', 'grpc-web-go-client',
                          'xxcomms', 'primitives', 'crypto', 'ring', 'comms'],
     },
@@ -80,11 +84,11 @@ proj_conf = {
                          'xxcomms', 'primitives', 'crypto', 'ring',
                          'comms', 'client'],
     },
-    # 'notifications-bot': {
-    #     'repo': 'git@git.xx.network:elixxir/notifications-bot',
-    #     'dependencies': ['xxprimitives', 'xxcrypto', 'xxcomms',
-    #                      'primitives', 'crypto', 'ring', 'comms'],
-    # },
+    'notifications-bot': {
+        'repo': 'git@git.xx.network:elixxir/notifications-bot',
+        'dependencies': ['xxprimitives', 'xxcrypto', 'xxcomms',
+                         'primitives', 'crypto', 'ring', 'comms', 'grpc-web-go-client'],
+    },
     # 'coupon-bot': {
     #     'repo': 'git@git.xx.network:elixxir/coupon-bot',
     #     'dependencies': ['xxprimitives', 'xxcrypto', 'xxcomms',