From 77e5abb6f06f55ebb685c9af26bcd3c58082e702 Mon Sep 17 00:00:00 2001
From: shirou <shirou.faw@gmail.com>
Date: Sun, 16 Sep 2018 17:40:02 +0900
Subject: [PATCH] migrate to circleci2 (#587)

* add circleci 2.0 config, which has golang 1.9 image.
---
 .circleci/config.yml | 28 ++++++++++++++++++++++++
 .gitignore           |  1 +
 Gopkg.lock           | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 Gopkg.toml           | 46 ++++++++++++++++++++++++++++++++++++++
 Makefile             |  3 +++
 circle.yml           | 13 -----------
 6 files changed, 140 insertions(+), 13 deletions(-)
 create mode 100644 .circleci/config.yml
 create mode 100644 Gopkg.lock
 create mode 100644 Gopkg.toml
 delete mode 100644 circle.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..8c8d5ae
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,28 @@
+version: 2
+jobs:
+  test:
+    docker:
+      - image: circleci/golang:1.9
+    working_directory: /home/circleci/go/src/github.com/shirou/gopsutil
+    environment:
+      GOPATH: /home/circleci/go
+    steps:
+      - run:
+          command: |
+            echo -e 'export PATH=$GOPATH/bin:$PATH' >> $BASH_ENV
+            source /home/circleci/.bashrc
+      - checkout
+      - run:
+          command: make init_tools
+      - run:
+          command: dep ensure
+      - run:
+          command: go build -v
+      - run:
+          command: make build_test
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test
diff --git a/.gitignore b/.gitignore
index d2b87e8..30b486b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 _obj
 *.tmp
 .idea
+vendor
diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 0000000..34a469b
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,62 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/StackExchange/wmi"
+  packages = ["."]
+  revision = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"
+  version = "1.0.0"
+
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"
+  version = "v1.1.1"
+
+[[projects]]
+  name = "github.com/go-ole/go-ole"
+  packages = [
+    ".",
+    "oleutil"
+  ]
+  revision = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"
+  version = "v1.2.1"
+
+[[projects]]
+  name = "github.com/pmezard/go-difflib"
+  packages = ["difflib"]
+  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/shirou/w32"
+  packages = ["."]
+  revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"
+
+[[projects]]
+  name = "github.com/stretchr/testify"
+  packages = [
+    "assert",
+    "require"
+  ]
+  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
+  version = "v1.2.2"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = [
+    "unix",
+    "windows",
+    "windows/svc",
+    "windows/svc/mgr"
+  ]
+  revision = "d0be0721c37eeb5299f245a996a483160fc36940"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "89929c5aa8f9bda295b48691b590eeec9462f8928b83c593eccb58ef45b667ac"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 0000000..c53eeac
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,46 @@
+# Gopkg.toml example
+#
+# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   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
+
+
+[[constraint]]
+  name = "github.com/StackExchange/wmi"
+  version = "1.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/shirou/w32"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.2.2"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/sys"
+
+[prune]
+  go-tests = true
+  unused-packages = true
diff --git a/Makefile b/Makefile
index 83dabed..02f33f5 100644
--- a/Makefile
+++ b/Makefile
@@ -31,3 +31,6 @@ ifeq ($(shell uname -s), Darwin)
 	CGO_ENABLED=1 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
 endif
 	@echo 'Successfully built on all known operating systems'
+
+init_tools:
+	go get github.com/golang/dep/cmd/dep
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 541cded..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-machine:
-  timezone:
-    Asia/Tokyo
-  pre:
-    - sudo chown -R ubuntu:ubuntu /usr/local/go/pkg/
-test:
-  override:
-    - GOOS=linux GOARCH=amd64 go test -v ./...
-    - GOOS=linux GOARCH=386 go get -v ./...
-    - GOOS=linux GOARCH=arm GOARM=7 go get -v ./...
-    - GOOS=freebsd GOARCH=amd64 go get -v ./...
-    - GOOS=windows GOARCH=amd64 go get -v ./...
-    - GOOS=darwin GOARCH=amd64 go get -v ./...