Skip to content

Fix build cache for PR builds #36

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

Open
cjolowicz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix build cache for PR builds #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc149cd
Use the same cache image for PR and branch builds
Sep 20, 2019
22d83cf
Update CHANGELOG.md
Sep 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Fix buildbot version in upgraded platforms ([#32](../../pull/32))

### Changed
- Optimize build cache for PR builds ([#36](../../pull/36))

## [2.4.1-1] - 2019-09-20
### Added
- Upgrade to buildbot 2.4.1 ([#29](../../pull/29))
Expand Down
9 changes: 8 additions & 1 deletion scripts/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@
# When a tag is built (TRAVIS_TAG), the branch cannot be determined from
# TRAVIS_BRANCH. Assume that it is a release tag: If the version is 1.8.x, we're
# on the 1.8 maintenance branch. Otherwise, we're on master.
if [ -z "$TRAVIS_TAG" ]
#
# For PR builds (TRAVIS_PULL_REQUEST_BRANCH), use the branch from which the PR
# originated, not the target branch. This means that the same image is used for
# the Docker build cache as for the corresponding branch build.
if [ -n "$TRAVIS_PULL_REQUEST_BRANCH" ]
then
BRANCH="$TRAVIS_PULL_REQUEST_BRANCH"
elif [ -z "$TRAVIS_TAG" ]
then
BRANCH="$TRAVIS_BRANCH"
elif [[ "$TRAVIS_TAG" =~ ^v1\.8\. ]]
Expand Down