Skip to content

Re-do #5482 w/ fixes for 'master' and out-of-repo PR builds.#5485

Merged
tseaver merged 1 commit intomasterfrom
5482-unbreak_master_and_pr_builds
Jun 14, 2018
Merged

Re-do #5482 w/ fixes for 'master' and out-of-repo PR builds.#5485
tseaver merged 1 commit intomasterfrom
5482-unbreak_master_and_pr_builds

Conversation

@tseaver
Copy link
Copy Markdown
Contributor

@tseaver tseaver commented Jun 13, 2018

No description provided.

@tseaver tseaver requested a review from theacodes June 13, 2018 20:29
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Jun 13, 2018
@tseaver tseaver merged commit 8b71b6d into master Jun 14, 2018
@tseaver tseaver deleted the 5482-unbreak_master_and_pr_builds branch June 14, 2018 00:10
@tseaver
Copy link
Copy Markdown
Contributor Author

tseaver commented Jun 14, 2018

FWIW, this PR doesn't actually fix #5083 for PR builds, only for branch push builds. In a PR build, the CI system sets the CIRCLE_BRANCH environment variable to a value like pull/1234. The git merge-base master pull/1234 command returns a hash which shows no files different, which means we can't compute a useful set of changed files.

@tseaver
Copy link
Copy Markdown
Contributor Author

tseaver commented Jun 14, 2018

Ugh, this isn't actually doing what I expected for branch pushes. See CI 6889:

##############################################################################
# Environment
#-----------------------------------------------------------------------------
# CircleCI:        true
# CircleCI branch: 5303-logging-harden_systest_resource_exhausted
# CircleCI pr:     None
# CircleCI tag:    None
##############################################################################
# Baseline commit: bbee15c961e1fcba6a9bd66bbc1d3685bb52f39f
##############################################################################
# Changed files:
#-----------------------------------------------------------------------------
#  
##############################################################################
# Target packages:
#-----------------------------------------------------------------------------
##############################################################################

I can't see why git merge-base master 5303-logging-harden_systest_resource_exhausted would return bbee15c as the baseline -- that commit is the tip of the 5303-logging-harden_systest_resource_exhausted branch!

In that case, the tests for logging happened to run, because this PR didn't pick up the grep -x change to .circleci/config.yaml from #5482, and the branch name includes logging.

@tseaver tseaver mentioned this pull request Jun 14, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@theacodes theacodes theacodes approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cla: yes This human has signed the Contributor License Agreement. testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tseaver @theacodes @googlebot