Clean up old code (#172)

.gitignore

@@ -24,3 +24,6 @@
 
 # Prometheus
 /data/
+
+# Go task
+/.task/

README.md

@@ -148,7 +148,7 @@ You can mix and match the libev and go servers and clients.
 
 To run the tests and benchmarks, call:
 ```
-make test
+go run github.com/go-task/task/v3/cmd/task test
 ```
 
 You can benchmark the cipher finding code with
@@ -165,11 +165,12 @@ We use [GoReleaser](https://goreleaser.com/) to build and upload binaries to our
 Summary:
 - Test the build locally:
  ```
- make release-local
+ go run github.com/go-task/task/v3/cmd/task release-local
  ```
 - Export an environment variable named `GITHUB_TOKEN` with a temporary repo-scoped GitHub token ([create one here](https://github.com/settings/tokens/new)):
  ```bash
- export GITHUB_TOKEN=yournewtoken
+ read -s -p "Type your Github token:" GITHUB_TOKEN
+ export GITHUB_TOKEN
  ```
 - Create a new tag and push it to GitHub e.g.:
  ```bash
@@ -178,7 +179,7 @@ Summary:
  ```
 - Build and upload:
  ```bash
- make release
+ go run github.com/go-task/task/v3/cmd/task release
  ```
 - Go to https://github.com/Jigsaw-Code/outline-ss-server/releases, review and publish the release.
 

Taskfile.yml

@@ -0,0 +1,40 @@
+version: '3'
+
+run: when_changed
+
+vars:
+ OUT_DIR: "{{.USER_WORKING_DIR}}/dist"
+
+tasks:
+ release:
+ desc: "Release"
+ deps: [clean]
+ cmds:
+ - go run github.com/goreleaser/goreleaser
+
+
+ release-local:
+ desc: "Build a release binary"
+ cmds:
+ - go run github.com/goreleaser/goreleaser --clean --snapshot
+
+ test:
+ desc: "Runs tests"
+ deps: [mmdb]
+ cmds:
+ - go test -v -race -benchmem -bench=. ./... -benchtime=100ms
+
+ mmdb:
+ cmds:
+ - git submodule update --init --depth=1
+ sources:
+ - "{{.ROOT_DIR}}/gitmodules"
+ generates:
+ - "{{.ROOT_DIR}}/third_party/maxmind/test-data/GeoIP2-Country-Test.mmdb"
+
+ clean:
+ desc: "Cleans output directory"
+ cmds:
+ - rm -rf {{.OUT_DIR}}
+ - git submodule deinit --all
+ - go clean

go.mod

@@ -1,15 +1,16 @@
 module github.com/Jigsaw-Code/outline-ss-server
 
 require (
- github.com/Jigsaw-Code/outline-sdk v0.0.2
+ github.com/Jigsaw-Code/outline-sdk v0.0.14
+ github.com/go-task/task/v3 v3.34.1
  github.com/goreleaser/goreleaser v1.18.2
  github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
  github.com/oschwald/geoip2-golang v1.8.0
  github.com/prometheus/client_golang v1.15.0
  github.com/shadowsocks/go-shadowsocks2 v0.1.5
  github.com/stretchr/testify v1.8.4
  golang.org/x/crypto v0.17.0
- golang.org/x/term v0.15.0
+ golang.org/x/term v0.16.0
  gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -110,6 +111,7 @@ require (
  github.com/elliotchance/orderedmap/v2 v2.2.0 // indirect
  github.com/emirpasic/gods v1.18.1 // indirect
  github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+ github.com/fatih/color v1.16.0 // indirect
  github.com/fsnotify/fsnotify v1.6.0 // indirect
  github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
  github.com/go-git/go-billy/v5 v5.5.0 // indirect
@@ -124,6 +126,7 @@ require (
  github.com/go-openapi/strfmt v0.21.7 // indirect
  github.com/go-openapi/swag v0.22.3 // indirect
  github.com/go-openapi/validate v0.22.1 // indirect
+ github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
  github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect
  github.com/gobwas/glob v0.2.3 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
@@ -158,21 +161,26 @@ require (
  github.com/invopop/jsonschema v0.7.0 // indirect
  github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
  github.com/jmespath/go-jmespath v0.4.0 // indirect
+ github.com/joho/godotenv v1.5.1 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/kevinburke/ssh_config v1.2.0 // indirect
  github.com/klauspost/compress v1.16.3 // indirect
+ github.com/klauspost/cpuid/v2 v2.0.9 // indirect
  github.com/klauspost/pgzip v1.2.5 // indirect
  github.com/kylelemons/godebug v1.1.0 // indirect
  github.com/letsencrypt/boulder v0.0.0-20221109233200-85aa52084eaf // indirect
  github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
  github.com/magiconair/properties v1.8.7 // indirect
  github.com/mailru/easyjson v0.7.7 // indirect
- github.com/mattn/go-isatty v0.0.17 // indirect
+ github.com/mattn/go-colorable v0.1.13 // indirect
+ github.com/mattn/go-isatty v0.0.20 // indirect
  github.com/mattn/go-mastodon v0.0.6 // indirect
  github.com/mattn/go-runewidth v0.0.14 // indirect
+ github.com/mattn/go-zglob v0.0.4 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
  github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
+ github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/muesli/mango v0.1.0 // indirect
@@ -194,9 +202,10 @@ require (
  github.com/prometheus/client_model v0.3.0 // indirect
  github.com/prometheus/common v0.42.0 // indirect
  github.com/prometheus/procfs v0.9.0 // indirect
- github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
+ github.com/radovskyb/watcher v1.0.7 // indirect
  github.com/rivo/uniseg v0.4.2 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
+ github.com/sajari/fuzzy v1.0.0 // indirect
  github.com/sasha-s/go-csync v0.0.0-20210812194225-61421b77c44b // indirect
  github.com/sergi/go-diff v1.2.0 // indirect
  github.com/sigstore/cosign/v2 v2.0.0 // indirect
@@ -221,20 +230,21 @@ require (
  github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1 // indirect
  github.com/xanzy/go-gitlab v0.83.0 // indirect
  github.com/xanzy/ssh-agent v0.3.3 // indirect
+ github.com/zeebo/xxh3 v1.0.2 // indirect
  gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect
  go.mongodb.org/mongo-driver v1.11.3 // indirect
  go.opencensus.io v0.24.0 // indirect
  go.uber.org/automaxprocs v1.5.2 // indirect
  gocloud.dev v0.29.0 // indirect
- golang.org/x/exp v0.0.0-20230124195608-d38c7dcee874 // indirect
- golang.org/x/mod v0.12.0 // indirect
+ golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e // indirect
+ golang.org/x/mod v0.14.0 // indirect
  golang.org/x/net v0.19.0 // indirect
  golang.org/x/oauth2 v0.7.0 // indirect
- golang.org/x/sync v0.3.0 // indirect
- golang.org/x/sys v0.15.0 // indirect
+ golang.org/x/sync v0.6.0 // indirect
+ golang.org/x/sys v0.16.0 // indirect
  golang.org/x/text v0.14.0 // indirect
  golang.org/x/time v0.3.0 // indirect
- golang.org/x/tools v0.13.0 // indirect
+ golang.org/x/tools v0.16.0 // indirect
  golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
  google.golang.org/api v0.119.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
@@ -247,6 +257,7 @@ require (
  gopkg.in/square/go-jose.v2 v2.6.0 // indirect
  gopkg.in/warnings.v0 v0.1.2 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
+ mvdan.cc/sh/v3 v3.7.0 // indirect
  sigs.k8s.io/kind v0.17.0 // indirect
  sigs.k8s.io/yaml v1.3.0 // indirect
 )