From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 25 Jul 2018 08:57:49 +0000 (+1000)
Subject: Use go modules
X-Git-Tag: v1.0.0~55
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=5baf7e0e4afcf2b14a998ced90a8647f0abfff02;p=btrtrc.git

Use go modules
---

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 464d417e..cc3a2d3e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,13 +3,13 @@ jobs:
   build:
     machine: true
     environment:
-      PROJECT_GO_PACKAGE: github.com/anacrolix/torrent
+      # PROJECT_GO_PACKAGE: github.com/anacrolix/torrent
     # Should use PROJECT_GO_PACKAGE here but it's not interpolated for this
     # field. https://discuss.circleci.com/t/environment-variable-expansion-in-
     # working-directory/11322/4
-    working_directory: ~/go/src/github.com/anacrolix/torrent
+    # working_directory: ~/go/src/github.com/anacrolix/torrent
     steps:
-      - run: echo $PROJECT_GO_PACKAGE
+      # - run: echo $PROJECT_GO_PACKAGE
       - run: echo $CIRCLE_WORKING_DIRECTORY
       - run: echo $PWD
       - run: echo 'export GOPATH=$HOME/go' >> $BASH_ENV
@@ -21,11 +21,11 @@ jobs:
       - checkout
       - run: sudo apt-get update
       - run: sudo apt install fuse pv
-      - run: go get -t -d -v -race $PROJECT_GO_PACKAGE/...
-      - run: go test -v -race $PROJECT_GO_PACKAGE/... -count 2
-      - run: go test -bench . $PROJECT_GO_PACKAGE/...
-      - run: CGO_ENABLED=0 go get -t -d -v $PROJECT_GO_PACKAGE/...
-      - run: set +e; CGO_ENABLED=0 go test -v $PROJECT_GO_PACKAGE/...; true
+      # - run: go get -t -d -v -race $PROJECT_GO_PACKAGE/...
+      - run: go test -v -race ./... -count 2
+      - run: go test -bench . ./...
+      # - run: CGO_ENABLED=0 go get -t -d -v $PROJECT_GO_PACKAGE/...
+      - run: set +e; CGO_ENABLED=0 go test -v ./...; true
       - run: go get golang.org/x/mobile/cmd/gomobile
       - run: gomobile init
       - run: gomobile build -target=android $PROJECT_GO_PACKAGE