From f3d98c26d90d0f92863c12dfe9a93aebbd6f59f8 Mon Sep 17 00:00:00 2001 From: Kazuki HASEGAWA Date: Sat, 21 Nov 2020 18:43:40 +0900 Subject: [PATCH] without go dep --- .circleci/config.yml | 4 ++-- Makefile | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d073685..b357294 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: '2.1' defaults: &defaults docker: - image: golang:1.15 - working_directory: /go/src/github.com/corrupt952/tmuxist + working_directory: /go/src/app workflows: version: 2 @@ -48,7 +48,7 @@ jobs: BUILD_GOARCH: amd64 CGO_ENABLED: 1 steps: - - run: go get -u github.com/golang/dep/cmd/dep github.com/mitchellh/gox + - run: go get -u github.com/mitchellh/gox - checkout - restore_cache: keys: diff --git a/Makefile b/Makefile index bfaa36e..be02879 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,7 @@ LDFLAGS ?= "-X github.com/corrupt952/tmuxist/version.Version=${VERSION}" all: build -dep: - dep ensure - -build: dep +build: gox -ldflags=${LDFLAGS} -output="pkg/{{.OS}}_{{.Arch}}/{{.Dir}}" -osarch="darwin/amd64 linux/amd64 linux/386" package: build @@ -17,14 +14,13 @@ package: build release: @ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} pkg - -run: dep +run: go run *.go fmt: go fmt ./... -test: dep +test: go test -v ./... lint: @@ -38,6 +34,5 @@ vars: echo ${LDFLAGS} setup: - go get -u github.com/golang/dep/cmd/dep go get -u github.com/mitchellh/gox go get -u golang.org/x/lint/golint