Skip to content

Commit 31851fb

Browse files
committed
Verify that vendored files are correct
Signed-off-by: Daniel Nephin <[email protected]>
1 parent 0a61397 commit 31851fb

3 files changed

Lines changed: 20 additions & 7 deletions

File tree

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,13 @@ cross: clean
2525
@gox -output build/docker-{{.OS}}-{{.Arch}} \
2626
-osarch="linux/arm linux/amd64 darwin/amd64 windows/amd64" \
2727
github.com/docker/cli/cmd/docker
28+
29+
vendor: vendor.conf
30+
@vndr 2> /dev/null
31+
@if [ "`git status --porcelain -- vendor 2>/dev/nul`" ]; then \
32+
echo; echo "vendoring is wrong. These files were changed:"; \
33+
echo; git status --porcelain -- vendor 2>/dev/nul; \
34+
echo; exit 1; \
35+
fi;
36+
37+
ci: cross test

circle.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,17 @@ jobs:
77
steps:
88
- checkout
99
- setup_remote_docker
10-
- run:
11-
name: "Lint"
10+
- run:
11+
name: "Lint"
1212
command: |
1313
docker build -f dockerfiles/Dockerfile.lint --tag cli-linter .
1414
docker run cli-linter
1515
- run:
1616
name: "Build and Unit Test"
17-
command: docker build -f dockerfiles/Dockerfile.ci .
17+
command: |
18+
docker build -f dockerfiles/Dockerfile.ci --tag cli-builder .
19+
docker run cli-builder
20+
- run:
21+
name: "Vendor"
22+
command: |
23+
docker run cli-builder make vendor

dockerfiles/Dockerfile.ci

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,4 @@ COPY . /go/src/github.com/docker/cli
2424
ENV CGO_ENABLED=0
2525
WORKDIR /go/src/github.com/docker/cli
2626

27-
RUN make cross
28-
RUN make test
29-
30-
CMD sh
27+
CMD ["make", "ci"]

0 commit comments

Comments
 (0)