Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 14, 2018
Merged

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

merged 1 commit into from
Jun 14, 2018

Conversation

tseaver
Copy link
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
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
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

@theacodes theacodes theacodes approved these changes

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
Morty Proxy This is a proxified and sanitized view of the page, visit original site.