From 848f4da3e1fb1d579b23118f0918fc478f68d632 Mon Sep 17 00:00:00 2001 From: Jono Wenger <jono@elixxir.io> Date: Thu, 15 Sep 2022 13:33:50 -0700 Subject: [PATCH] Update deps and Makefile --- Makefile | 20 +++++++++----------- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 0a9a9035..14bf12e4 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,4 @@ -.PHONY: update master release update_master update_release build clean version - -version: - go run main.go generate - sed -i.bak 's/package\ cmd/package\ xxdk/g' version_vars.go - mv version_vars.go xxdk/version_vars.go +.PHONY: update master release update_master update_release build clean binary clean: rm -rf vendor/ @@ -13,19 +8,22 @@ update: -GOFLAGS="" go get all build: - go build ./... + GOOS=js GOARCH=wasm go build ./... go mod tidy update_release: - GOFLAGS="" go get gitlab.com/elixxir/client@release + GOFLAGS="" go get -d gitlab.com/elixxir/client@release + GOFLAGS="" go get gitlab.com/elixxir/crypto@release + GOFLAGS="" go get gitlab.com/xx_network/primitives@release update_master: - GOFLAGS="" go get gitlab.com/elixxir/client@master + GOFLAGS="" go get -d gitlab.com/elixxir/client@master + GOFLAGS="" go get gitlab.com/elixxir/crypto@master + GOFLAGS="" go get gitlab.com/xx_network/primitives@master binary: GOOS=js GOARCH=wasm go build -ldflags '-w -s' -o xxdk.wasm main.go - -master: update_master clean build version +master: update_master clean build release: update_release clean build diff --git a/go.mod b/go.mod index b9605aa9..2dafdb0e 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/hack-pad/go-indexeddb v0.2.0 github.com/pkg/errors v0.9.1 github.com/spf13/jwalterweatherman v1.1.0 - gitlab.com/elixxir/client v1.5.1-0.20220914170015-49119bef386e + gitlab.com/elixxir/client v1.5.1-0.20220915201734-388210df879d gitlab.com/elixxir/crypto v0.0.7-0.20220913220142-ab0771bad0af gitlab.com/xx_network/primitives v0.0.4-0.20220809193445-9fc0a5209548 ) diff --git a/go.sum b/go.sum index 149c6f89..a874f99f 100644 --- a/go.sum +++ b/go.sum @@ -614,8 +614,8 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f h1:yXGvNBqzZwAhDYlSnxPRbgor6JWoOt1Z7s3z1O9JR40= gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f/go.mod h1:H6jztdm0k+wEV2QGK/KYA+MY9nj9Zzatux/qIvDDv3k= -gitlab.com/elixxir/client v1.5.1-0.20220914170015-49119bef386e h1:jwBHbaEikwcfoE0kOuD3uZlX88UPCdC5DUhkba38VN8= -gitlab.com/elixxir/client v1.5.1-0.20220914170015-49119bef386e/go.mod h1:N8GdwIkvdgc/cz2i5JY+t+QoNDRnYM1HL5XbMJvR9b0= +gitlab.com/elixxir/client v1.5.1-0.20220915201734-388210df879d h1:pD9VVvD/7/4vf0ieP/7DjvoVRkvdrYmlS+d6BxDw0i4= +gitlab.com/elixxir/client v1.5.1-0.20220915201734-388210df879d/go.mod h1:N8GdwIkvdgc/cz2i5JY+t+QoNDRnYM1HL5XbMJvR9b0= gitlab.com/elixxir/comms v0.0.4-0.20220913220502-eed192f654bd h1:2nHE7EoptSTBFjCxMeAveKT6urbguCwgg8Jx7XYEVe4= gitlab.com/elixxir/comms v0.0.4-0.20220913220502-eed192f654bd/go.mod h1:AO6XkMhaHJW8eXlgL5m3UUcJqsSP8F5Wm1GX+wyq/rw= gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c= -- GitLab