From 9b8036d2fc85db9e505cb7b9303e9d2f05f8839c Mon Sep 17 00:00:00 2001
From: Maxb <bittmanmax@gmail.com>
Date: Thu, 14 Nov 2024 13:18:21 -0800
Subject: [PATCH] Replace Makefile client generation with go module tag
---
Makefile | 7 -------
README.md | 6 +++---
go.mod | 2 +-
go.sum | 4 ++--
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 9cf56c6..459f719 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,3 @@
-client:
- COMMIT=c772d163d08f86170c9cd7813e4590220d4b704b; \
- echo "Fetching swagger specification for commit $${COMMIT}"; \
- curl https://0xacab.org/leap/menshen/-/raw/$${COMMIT}/api/swagger.yaml > swagger.yaml
- swagger generate client -c pkg/client -f swagger.yaml
- rm swagger.yaml
-
test:
go test -count=1 -p 1 -v ./... -skip '.*Integration.*'
diff --git a/README.md b/README.md
index 45d7258..4ffde5b 100644
--- a/README.md
+++ b/README.md
@@ -41,11 +41,11 @@ If everything works you will get `bitmask-core.aar` and `bitmask-core-sources.ja
# Maintenance
-For synchronized changes in the api, you need to install [swag](https://github.com/swaggo/swag) and use `make` to generate the Swagger client:
+For synchronized changes in the api, simply update the version of `menshen` that we import.
+This can be done with `go get`:
```
-go install github.com/swaggo/swag/cmd/swag@latest
-make client
+$ go get 0xacab.org/leap/menshen@HASH_OR_VERSION
```
# Tests
diff --git a/go.mod b/go.mod
index c4e75cb..43a5355 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module 0xacab.org/leap/bitmask-core
go 1.22.2
require (
- 0xacab.org/leap/menshen v0.0.0-20241107032234-af2a713b2094
+ 0xacab.org/leap/menshen v0.0.0-20241016220343-c772d163d08f
0xacab.org/leap/obfsvpn v0.0.0-20240310002923-fca734212815
0xacab.org/leap/tunnel-telemetry v0.0.0-20240830081933-7328bb50078b
github.com/asdine/storm/v3 v3.2.1
diff --git a/go.sum b/go.sum
index 5f5b4c5..a172706 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-0xacab.org/leap/menshen v0.0.0-20241107032234-af2a713b2094 h1:DriCDCrKuN8swbIeAKUiPq1/P/u8HTupI4cCXDdctcg=
-0xacab.org/leap/menshen v0.0.0-20241107032234-af2a713b2094/go.mod h1:gSbW66rJybmdWCXMO1xy+MXf/SVYjI78Jk249XEpPs8=
+0xacab.org/leap/menshen v0.0.0-20241016220343-c772d163d08f h1:0t8Z89evAqWBNcwdE+qNdH95drfPxA4hC61tl0sxCUg=
+0xacab.org/leap/menshen v0.0.0-20241016220343-c772d163d08f/go.mod h1:gSbW66rJybmdWCXMO1xy+MXf/SVYjI78Jk249XEpPs8=
0xacab.org/leap/obfsvpn v0.0.0-20240310002923-fca734212815 h1:N6cZJgTRrW0xS+Z5wN86eAb8B6jca9GKd4D/4769uRk=
0xacab.org/leap/obfsvpn v0.0.0-20240310002923-fca734212815/go.mod h1:cOGeSmVkgxW5qYIOSvkBeFxwBnoOYsjuQWFYB5YYlm4=
0xacab.org/leap/tunnel-telemetry v0.0.0-20240830081933-7328bb50078b h1:GI6SVhECFVdHalARYd5Qt/i5/+M0fjcLtJIEEQVO4Sk=
--
GitLab