Skip to content

Commit

Permalink
Reshufle appveyor and fix gitingore
Browse files Browse the repository at this point in the history
  • Loading branch information
pecigonzalo committed Jul 6, 2016
1 parent 4460628 commit 107d119
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 34 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Glide
./vendor
vendor/

# Compiled Object files, Static and Dynamic libs (Shared Objects)
*.o
Expand All @@ -26,4 +26,4 @@ _testmain.go
*.test
*.prof

./bin
bin/
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#export GO15VENDOREXPERIMENT = 1

default: test build
default: deps test build

deps:
deps: clean
go get github.com/Masterminds/glide
glide install

test: deps
go test -v ./...
go vet ./...
test:
go test -v $(glide novendor)
go vet $(glide novendor)

build: deps
build:
go build -i -o ./bin/docker-machine-driver-vmwareworkstation.exe ./cmd/

clean:
$(RM) -rf vendor
$(RM) bin/*

.PHONY: clean test build
.PHONY: clean deps test build
21 changes: 10 additions & 11 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,32 @@ clone_depth: 5
os: Windows Server 2012 R2

environment:
MSYSTEM: MINGW64
Msys: winsymlink:nativestrict
GOPATH: c:\gopath
Path: c:\go\bin;c:\gopath\bin;C:\msys64\usr\local\bin;C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
matrix:
- GOARCH: 386
GOVERSION: 1.6
- GOARCH: amd64
GOVERSION: 1.6

init:
- git config --global core.autocrlf input
- ps: git config --global core.autocrlf input
- pacman -Sy
- pacman -S --noconfirm make wget curl bzr git mercurial subversion

# Build

install:
- set Path=c:\go\bin;%GOPATH%/bin;%Path%
- echo %Path%
- appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-%GOARCH%.msi
- msiexec /i go%GOVERSION%.windows-%GOARCH%.msi /q
- go version
- go env
- go get github.com/Masterminds/glide
- glide install
- ps: echo $env:Path
- make deps

build_script:
- go test -v ./...
- go vet ./...
- git rev-parse HEAD
- go build -i -o ./bin/docker-machine-driver-vmwareworkstation_windows-%GOARCH%.exe ./cmd/
- make test
- make build

test: off

Expand Down
14 changes: 3 additions & 11 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@ package: github.com/pecigonzalo/docker-machine-vmwareworkstation
import:
- package: github.com/docker/machine
version: v0.7.0
subpackages:
- libmachine/drivers
- libmachine/drivers/plugin
- libmachine/log
- libmachine/mcnflag
- libmachine/mcnutils
- libmachine/ssh
- libmachine/state
- package: golang.org/x/crypto
- package: github.com/Sirupsen/logrus
- package: google.golang.org/grpc
subpackages:
- credentials/oauth
- ssh
testImport:
- package: github.com/stretchr/testify
version: v1.1.3
Expand Down

0 comments on commit 107d119

Please sign in to comment.