Skip to content

Commit

Permalink
More go nodules work
Browse files Browse the repository at this point in the history
  • Loading branch information
dgageot committed Jul 24, 2019
1 parent f186751 commit f053b3c
Show file tree
Hide file tree
Showing 3,595 changed files with 1,080,677 additions and 122 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
21 changes: 17 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ go: "1.12.x"
git:
submodules: false

env:
global:
- GO111MODULE=on

go_import_path: github.com/GoogleContainerTools/skaffold

jobs:
Expand All @@ -26,6 +22,23 @@ jobs:
- make test
after_success:
- bash <(curl -s https://codecov.io/bash)
- os: linux
env:
- TEST_TYPE=unit # this is not used, just purely for nice UI distinction on Travis
- GOPROXY=https://proxy.golang.org
script:
- make
- make test
after_success:
- bash <(curl -s https://codecov.io/bash)
- os: linux
env:
- TEST_TYPE=unit # this is not used, just purely for nice UI distinction on Travis
script:
- make
- make test
after_success:
- bash <(curl -s https://codecov.io/bash)
- os: osx
cache:
directories:
Expand Down
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# limitations under the License.
GOOS ?= $(shell go env GOOS)
GOARCH = amd64
GO111MODULE ?= on
BUILD_DIR ?= ./out
ORG := github.com/GoogleContainerTools
PROJECT := skaffold
Expand Down Expand Up @@ -65,7 +66,7 @@ $(BUILD_DIR)/$(PROJECT): $(BUILD_DIR)/$(PROJECT)-$(GOOS)-$(GOARCH)
cp $(BUILD_DIR)/$(PROJECT)-$(GOOS)-$(GOARCH) $@

$(BUILD_DIR)/$(PROJECT)-$(GOOS)-$(GOARCH): $(GO_FILES) $(BUILD_DIR)
GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=1 go build -tags $(GO_BUILD_TAGS_$(GOOS)) -ldflags $(GO_LDFLAGS_$(GOOS)) -gcflags $(GO_GCFLAGS) -asmflags $(GO_ASMFLAGS) -o $@ $(BUILD_PACKAGE)
GO111MODULE=$(GO111MODULE) GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=1 go build -tags $(GO_BUILD_TAGS_$(GOOS)) -ldflags $(GO_LDFLAGS_$(GOOS)) -gcflags $(GO_GCFLAGS) -asmflags $(GO_ASMFLAGS) -o $@ $(BUILD_PACKAGE)

$(BUILD_DIR)/$(PROJECT)-%-$(GOARCH): $(GO_FILES) $(BUILD_DIR)
docker build --build-arg PROJECT=$(REPOPATH) \
Expand Down Expand Up @@ -95,11 +96,11 @@ cross: $(foreach platform, $(SUPPORTED_PLATFORMS), $(BUILD_DIR)/$(PROJECT)-$(pla

.PHONY: test
test: $(BUILD_DIR)
@ ./hack/test.sh
@ GO111MODULE=$(GO111MODULE) ./hack/test.sh

.PHONY: install
install: $(GO_FILES) $(BUILD_DIR)
GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=1 go install -tags $(GO_BUILD_TAGS_$(GOOS)) -ldflags $(GO_LDFLAGS_$(GOOS)) -gcflags $(GO_GCFLAGS) -asmflags $(GO_ASMFLAGS) $(BUILD_PACKAGE)
GO111MODULE=$(GO111MODULE) GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=1 go install -tags $(GO_BUILD_TAGS_$(GOOS)) -ldflags $(GO_LDFLAGS_$(GOOS)) -gcflags $(GO_GCFLAGS) -asmflags $(GO_ASMFLAGS) $(BUILD_PACKAGE)

.PHONY: integration
integration: install
Expand All @@ -110,7 +111,7 @@ ifeq ($(GCP_ONLY),true)
--project $(GCP_PROJECT)
endif
kubectl get nodes -oyaml
GCP_ONLY=$(GCP_ONLY) go test -v $(REPOPATH)/integration -timeout 20m $(INTEGRATION_TEST_ARGS)
GO111MODULE=$(GO111MODULE) GCP_ONLY=$(GCP_ONLY) go test -v $(REPOPATH)/integration -timeout 20m $(INTEGRATION_TEST_ARGS)

.PHONY: release
release: cross $(BUILD_DIR)/VERSION
Expand Down
114 changes: 0 additions & 114 deletions go.sum

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions vendor/4d63.com/tz/.gitignore

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

12 changes: 12 additions & 0 deletions vendor/4d63.com/tz/.travis.yml

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

53 changes: 53 additions & 0 deletions vendor/4d63.com/tz/LICENSE

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

19 changes: 19 additions & 0 deletions vendor/4d63.com/tz/README.md

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

1 change: 1 addition & 0 deletions vendor/4d63.com/tz/go.mod

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

39 changes: 39 additions & 0 deletions vendor/4d63.com/tz/tz.go

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

1,194 changes: 1,194 additions & 0 deletions vendor/4d63.com/tz/zoneinfo.go

Large diffs are not rendered by default.

Loading

0 comments on commit f053b3c

Please sign in to comment.