37445
0%
main: 80%

Ran 03 Feb 2021 10:31PM UTC

Jobs 1

Files 418

Run time 1min

Badge

Embed ▾

pending completion

Build # 37445

Build Type

push

travis-ci-com

Committed by

web-flow

Commit Message

Fall back to the previous commit as merge-base if no tracking branch (cherrypick of #11519) (#11520)

### Problem

Branch-PR builds (e.g. PRs merging to stable branches like `2.2.x`) currently fail to calculate the merge-base because HEAD is not a branch, and thus doesn't have an upstream branch. Currently we fall back to diffing against `master`, but that won't necessarily exist in a shallowly created clone.

### Solution

Rather than `master`, use the previous commit as the merge-base when there is no tracking branch.

### Result

Verified in #11520 that PR branch builds are fixed.

[ci skip-rust]

Run Details

0 of 29050 relevant lines covered (0.0%)

0.0 hits per line

Jobs

ID	Job ID	Ran	Files	Coverage
4	37445.4 (PANTS_CONFIG_FILES="${TRAVIS_BUILD_DIR}/pants.travis-ci.toml" PANTS_DYNAMIC_UI=false LC_ALL="en_US.UTF-8" AWS_BUCKET=ci-public.pantsbuild.org BOOTSTRAPPED_PEX_KEY_PREFIX=daily/${TRAVIS_BUILD_NUMBER}/${TRAVIS_BUILD_ID}/pants.pex NATIVE_ENGINE_SO_KEY_PREFIX=monthly/native_engine_so MACOS_PYENV_PY27_VERSION=2.7.18 MACOS_PYENV_PY37_VERSION=3.7.7 MACOS_PYENV_PY38_VERSION=3.8.3 PYENV_ROOT_OSX=${HOME}/.pants_pyenv PYENV_ROOT="${PYENV_ROOT:-${PYENV_ROOT_OSX}}" PATH="${PYENV_ROOT}/shims:${PATH}" AWS_CLI_ROOT="${HOME}/.aws_cli" AWS_ACCESS_KEY_ID__TO_BE_REEXPORTED_ON_DEPLOYS=AKIAV6A6G7RQ2HFZ5KP7 AWS_SECRET_ACCESS_KEY=[secure] RUST_BACKTRACE="all" BOOTSTRAPPED_PEX_KEY_SUFFIX=py37.linux CACHE_NAME=python_tests.py37)	03 Feb 2021 10:31PM UTC	0	0.0	Travis Job 37445.4

Source Files on build 37445

Detailed source file information is not available for this build.

pantsbuild / pants / 37445
0%
main: 80%

README BADGES
x

Markdown

Textile

RDoc

HTML

Rst

Jobs

Source Files on build 37445

pantsbuild / pants / 37445 0% main: 80%

README BADGES x

Markdown

Textile

RDoc

HTML

Rst

Jobs

Source Files on build 37445

pantsbuild / pants / 37445
0%
main: 80%

README BADGES
x