Skip to content

Commit

Permalink
Move linting into it's own serial step
Browse files Browse the repository at this point in the history
This should hopefully reduce test flakiness.
  • Loading branch information
markmandel committed Jul 30, 2018
1 parent 6c2b03b commit 259662e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ build-images: build-controller-image build-agones-sdk-image
build-sdks: build-sdk-cpp

# Run all tests
test: ensure-build-image lint test-go test-install-yaml
test: ensure-build-image test-go test-install-yaml

# Run go tests
test-go:
Expand Down Expand Up @@ -257,7 +257,7 @@ do-release: RELEASE_VERSION ?= $(base_version)
do-release:
@echo "Starting release for version: $(RELEASE_VERSION)"
git checkout -b release-$(RELEASE_VERSION)
$(MAKE) test
$(MAKE) lint test
-rm -rf $(agones_path)/release
mkdir $(agones_path)/release
docker run --rm $(common_mounts) -w $(mount_path)/sdks/cpp $(build_tag) make clean
Expand Down
9 changes: 6 additions & 3 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,19 @@ steps:
- name: "make-docker"
dir: "build"
args: ["pull-build-image"] # pull the build image if it exists
id: pull-build-image
- name: "lint"
dir: "build"
args: ["lint"] # pull the build image if it exists
id: lint
- name: "make-docker"
dir: "build"
args: [ "test" ] # run tests
waitFor: ['pull-build-image']
waitFor: ['lint']
id: tests
- name: "make-docker"
dir: "build"
args: [ "build", "push" ] # build all the things, and push images
waitFor: ['pull-build-image']
waitFor: ['lint']
id: build
- name: 'gcr.io/cloud-builders/gsutil'
dir: "sdks/cpp/bin"
Expand Down

0 comments on commit 259662e

Please sign in to comment.