Merge branch 'master' into master
4c8e288fcf15
Actions

Authored by bryanzim <BryanZim@bazinnovations.com> on Dec 11 2017, 20:11.

Description

Merge branch 'master' into master

Committed

GitHub <noreply@github.com>

Dec 11 2017, 20:11

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:4c8e288fcf15: Merge branch 'master' into master (authored by bryanzim <BryanZim@bazinnovations.com>).Dec 11 2017, 20:11

Commit	Author	Details	Committed
0fe96607d85c	Gennadiy Civil/GitHub	Merge pull request #1355 from coryan/blaze-build-travis	Dec 11 2017
ed811dc79feb	Gennadiy Civil/GitHub	Merge branch 'master' into blaze-build-travis	Dec 11 2017
bc3320b7f1da	Carlos O'Ryan	Implement bazel-based builds in Travis.	Dec 9 2017

		Path
M		.travis.yml
A	(dir)	ci/
P		ci/build-linux-bazel.sh Copied from googlemock/test/BUILD.bazel
P		ci/env-linux.sh Copied from googlemock/test/BUILD.bazel
P		ci/env-osx.sh Copied from googlemock/test/BUILD.bazel
P		ci/install-linux.sh Copied from googlemock/test/BUILD.bazel
P		ci/install-osx.sh Copied from googlemock/test/BUILD.bazel
P		ci/log-config.sh Copied from googlemock/test/BUILD.bazel
V		{ci ← }/travis.sh
V		{ → ci}/travis.sh