Revert "Update package layout (#9)"

.circleci/config.yml

@@ -1,81 +1,54 @@
-checkout-path: &checkout-path
-  checkout-path: /go/src/github.com/nmiyake/pkg
+working_dir: &working_dir
+  working_directory: /go/src/github.com/nmiyake/pkg
 
-version: 2.1
+steps: &steps
+  - checkout
+  - restore_cache:
+      keys:
+        - godel-cache-{{ checksum "godelw" }}-{{ checksum "godel/config/godel.yml" }}-v1
+  - run: ./godelw version
+  - save_cache:
+      key: godel-cache-{{ checksum "godelw" }}-{{ checksum "godel/config/godel.yml" }}-v1
+      paths:
+        - ~/.godel
+  - run: echo 'export TESTS_DIR=/tmp/test-results' >> $BASH_ENV
+  - run: mkdir -p "${TESTS_DIR}"
+  - run: |
+         if [ ! -z "$VERIFY" ]; then
+           echo "Verify" && ./godelw verify --apply=false --junit-output="$TESTS_DIR/$CIRCLE_PROJECT_REPONAME-tests.xml"
+         else
+           echo "Test" && ./godelw test --junit-output="$TESTS_DIR/$CIRCLE_PROJECT_REPONAME-tests.xml"
+         fi
+  - type: test-results-store
+    path: /tmp/test-results
+  - type: artifacts-store
+    path: /tmp/test-results
+    destination: test-results
 
-orbs:
-  go: palantir/go@0.0.14
-  godel: palantir/godel@0.0.14
+version: 2
+jobs:
+  go-1.11:
+    <<: *working_dir
+    environment:
+      VERIFY: 1
+    docker:
+      - image: golang:1.11.2
+    steps: *steps
+  go-1.10:
+    <<: *working_dir
+    docker:
+      - image: golang:1.10.5
+    steps: *steps
+  go-1.9:
+    <<: *working_dir
+    docker:
+    - image: golang:1.9.7
+    steps: *steps
 
 workflows:
   version: 2
-  verify-test:
+  verify:
     jobs:
-      # dirs
-      - godel/verify:
-          name: dirs-verify
-          <<: *checkout-path
-          executor:
-            name: go/golang
-            version: 1.13.4
-            owner-repo: nmiyake/pkg/dirs
-      - godel/test:
-          name: dirs-test-go-1.13
-          <<: *checkout-path
-          executor:
-            name: go/golang
-            version: 1.13.4
-            owner-repo: nmiyake/pkg/dirs
-      - godel/test:
-          name: dirs-test-go-1.12
-          <<: *checkout-path
-          executor:
-            name: go/golang
-            version: 1.12.13
-            owner-repo: nmiyake/pkg/dirs
-
-      # errorstringer
-      - godel/verify:
-          name: errorstringer-verify
-          <<: *checkout-path
-          executor:
-            name: go/golang
-            version: 1.13.4
-            owner-repo: nmiyake/pkg/errorstringer
-      - godel/test:
-          name: errorstringer-test-go-1.13
-          <<: *checkout-path
-          executor:
-            name: go/golang
-            version: 1.13.4
-            owner-repo: nmiyake/pkg/errorstringer
-      - godel/test:
-          name: errorstringer-test-go-1.12
-          <<: *checkout-path
-          executor:
-            name: go/golang
-            version: 1.12.13
-            owner-repo: nmiyake/pkg/errorstringer
-
-      # gofiles
-      - godel/verify:
-          name: gofiles-verify
-          <<: *checkout-path
-          executor:
-            name: go/golang
-            version: 1.13.4
-            owner-repo: nmiyake/pkg/gofiles
-      - godel/test:
-          name: gofiles-test-go-1.13
-          <<: *checkout-path
-          executor:
-            name: go/golang
-            version: 1.13.4
-            owner-repo: nmiyake/pkg/gofiles
-      - godel/test:
-          name: gofiles-test-go-1.12
-          <<: *checkout-path
-          executor:
-            name: go/golang
-            version: 1.12.13
-            owner-repo: nmiyake/pkg/gofiles
+      - go-1.11
+      - go-1.10
+      - go-1.9

gofiles/Gopkg.toml → Gopkg.toml

@@ -1,6 +1,7 @@
+
 # Gopkg.toml example
 #
-# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
 # for detailed Gopkg.toml documentation.
 #
 # required = ["github.com/user/thing/cmd/thing"]
@@ -16,23 +17,10 @@
 #   source = "github.com/myfork/project2"
 #
 # [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-# [prune]
-#   non-go = false
-#   go-tests = true
-#   unused-packages = true
+#  name = "github.com/x/y"
+#  version = "2.4.0"
 
 
 [[constraint]]
-  branch = "develop"
-  name = "github.com/nmiyake/pkg"
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.4.0"
-
-[prune]
-  go-tests = true
-  unused-packages = true
+  name = "github.com/pkg/errors"
+  version = "0.8.0"