Skip to content

Commit

Permalink
remove support for Go < 1.13 and dep
Browse files Browse the repository at this point in the history
With `ghw` v1.0, support for `dep` and Go <1.13 is removed.
  • Loading branch information
jaypipes committed Jun 1, 2020
1 parent c36d042 commit 7b9a68c
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 145 deletions.
25 changes: 3 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,17 @@ script:
- go run cmd/ghwc/main.go
env:
- GHW_TESTING_SKIP_GPU=1
- GO111MODULE="on"
matrix:
include:
# On Go 1.10 and Go 1.11, use dep to ensure dependencies before running go
# test.
- os: linux
go: "1.10"
install:
- go get -u github.com/golang/dep/cmd/dep
- dep ensure -v
- os: linux
go: "1.11"
install:
- go get -u github.com/golang/dep/cmd/dep
- dep ensure -v
# On Go >=1.12, use go modules to ensure dependencies instead of dep
- os: linux
go: "1.12"
env: GO111MODULE=on
- os: linux
go: "1.13"
env: GO111MODULE=on
- os: linux
go: "1.14.x"
env: GO111MODULE=on

# Tests that ghw builds on MacOSX (even though there is currently only
# support for block devices)
#- os: osx
# go: "1.12"
# env: GO111MODULE=on
#- os: osx
# go: "1.13"
# env: GO111MODULE=on
#- os: osx
# go: "1.14.x"
87 changes: 0 additions & 87 deletions Gopkg.lock

This file was deleted.

28 changes: 0 additions & 28 deletions Gopkg.toml

This file was deleted.

8 changes: 0 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,12 @@ VENDOR := vendor
PKGS := $(shell go list ./... | grep -v /$(VENDOR)/)
SRC = $(shell find . -type f -name '*.go' -not -path "*/$(VENDOR)/*")
BIN_DIR := $(GOPATH)/bin
DEP := $(BIN_DIR)/dep
GOMETALINTER := $(BIN_DIR)/gometalinter

.PHONY: test
test: vet
go test $(PKGS)

$(DEP):
go get -u github.com/golang/dep/cmd/dep

.PHONY: dep
dep: $(DEP)
$(DEP) ensure

$(GOMETALINTER):
go get -u github.com/alecthomas/gometalinter
$(GOMETALINTER) --install &> /dev/null
Expand Down

0 comments on commit 7b9a68c

Please sign in to comment.