Skip to content
Snippets Groups Projects
Commit f90b55a5 authored by Mark Mandel's avatar Mark Mandel Committed by Cyril Tovena
Browse files

Move linting into it's own serial step

This should hopefully reduce test flakiness.
parent 6c2b03b5
No related branches found
No related tags found
No related merge requests found
...@@ -102,7 +102,7 @@ build-images: build-controller-image build-agones-sdk-image ...@@ -102,7 +102,7 @@ build-images: build-controller-image build-agones-sdk-image
build-sdks: build-sdk-cpp build-sdks: build-sdk-cpp
# Run all tests # 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 # Run go tests
test-go: test-go:
...@@ -257,7 +257,7 @@ do-release: RELEASE_VERSION ?= $(base_version) ...@@ -257,7 +257,7 @@ do-release: RELEASE_VERSION ?= $(base_version)
do-release: do-release:
@echo "Starting release for version: $(RELEASE_VERSION)" @echo "Starting release for version: $(RELEASE_VERSION)"
git checkout -b release-$(RELEASE_VERSION) git checkout -b release-$(RELEASE_VERSION)
$(MAKE) test $(MAKE) lint test
-rm -rf $(agones_path)/release -rm -rf $(agones_path)/release
mkdir $(agones_path)/release mkdir $(agones_path)/release
docker run --rm $(common_mounts) -w $(mount_path)/sdks/cpp $(build_tag) make clean docker run --rm $(common_mounts) -w $(mount_path)/sdks/cpp $(build_tag) make clean
......
...@@ -24,16 +24,19 @@ steps: ...@@ -24,16 +24,19 @@ steps:
- name: "make-docker" - name: "make-docker"
dir: "build" dir: "build"
args: ["pull-build-image"] # pull the build image if it exists args: ["pull-build-image"] # pull the build image if it exists
id: pull-build-image - name: "make-docker"
dir: "build"
args: ["lint"] # pull the build image if it exists
id: lint
- name: "make-docker" - name: "make-docker"
dir: "build" dir: "build"
args: [ "test" ] # run tests args: [ "test" ] # run tests
waitFor: ['pull-build-image'] waitFor: ['lint']
id: tests id: tests
- name: "make-docker" - name: "make-docker"
dir: "build" dir: "build"
args: [ "build", "push" ] # build all the things, and push images args: [ "build", "push" ] # build all the things, and push images
waitFor: ['pull-build-image'] waitFor: ['lint']
id: build id: build
- name: 'gcr.io/cloud-builders/gsutil' - name: 'gcr.io/cloud-builders/gsutil'
dir: "sdks/cpp/bin" dir: "sdks/cpp/bin"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment