Skip to content
This repository was archived by the owner on Nov 7, 2023. It is now read-only.

Commit da48c85

Browse files
authored
Merge pull request #109 from cloudflare/0.6.x
0.6.x
2 parents a9f8394 + 37a7f98 commit da48c85

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+5462
-2929
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ vendor/
66
.vs/
77
.vscode/
88
.idea/
9+
coverage.txt
910

1011
# MacOS
1112
.DS_Store

.travis.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,14 @@ install:
88
- go get -u github.com/golang/dep/cmd/dep && dep ensure -vendor-only -v
99

1010
script:
11-
- make check
11+
- make check
12+
13+
notifications:
14+
email:
15+
recipients:
16+
17+
on_success: never
18+
on_failure: change
19+
20+
after_success:
21+
- bash <(curl -s https://codecov.io/bash)

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.10.4 AS build
1+
FROM golang:1.10.5 AS build
22
WORKDIR /go/src/github.com/cloudflare/cloudflare-ingress-controller
33

44
ARG VERSION="unknown"

Gopkg.lock

Lines changed: 63 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929
[[constraint]]
3030
name = "github.com/cloudflare/cloudflared"
3131
source = "https://github.com/cloudflare/cloudflared.git"
32-
revision = "671483a95c23493f63fb554ab9b69ffaf6390149"
32+
revision = "c85c8526e85871a3e267fa472623c7e1baf63f07"

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ build-dir:
3838
@mkdir -p $(TMP_DIR)
3939

4040
.PHONY: check
41-
check: test vet fmt staticcheck unused misspell
41+
check: test-race vet fmt staticcheck unused misspell
4242

4343
.PHONY: clean
4444
clean:
4545
@echo cleaning build targets
46-
@rm -rf bin .build
46+
@rm -rf $(TMP_DIR) bin coverage.txt
4747

4848
.PHONY: container
4949
container:
@@ -126,7 +126,7 @@ staticcheck:
126126
.PHONY: test
127127
test: install
128128
@echo testing code for issues
129-
@go test ./...
129+
@go test -coverprofile=coverage.txt -covermode=atomic ./...
130130

131131
.PHONY: test-race
132132
test-race: | test

0 commit comments

Comments
 (0)