blob: 48a28a553c36f73a316bba9cf21c8d7057596c15 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
#!/bin/bash
set -eu
docker ps || true
free -m
# We've now seen cases where origin/master on the build hosts can get
# out of date. This causes us to build components unnecessarily.
# Fetching it here hopefully will prevent this situation.
echo "Fetching origin/master"
git fetch origin master
# DEBUGGING FOR RELENG
# Fetch the git tags to see if that addresses the weird smart build behavior for Habitat
git fetch --tags --force
# Rebase onto current master to ensure this PR is closer to what happens when it's merged.
# Only do this if it's actually a branch (i.e. a PR or a manually created build), not a
# post-merge CI run of master.
if [[ "$BUILDKITE_BRANCH" != "master" ]]; then
git config user.email "you@example.com" # these are needed for the rebase attempt
git config user.name "Your Name"
master=$(git show-ref -s --abbrev origin/master)
pr_head=$(git show-ref -s --abbrev HEAD)
github="https://github.com/chef/chef/commit/"
if git rebase origin/master >/dev/null; then
buildkite-agent annotate --style success --context "rebase-pr-branch-${master}" \
"Rebased onto master ([${master}](${github}${master}))."
else
git rebase --abort
buildkite-agent annotate --style warning --context "rebase-pr-branch-${master}" \
"Couldn't rebase onto master ([${master}](${github}${master})), building PR HEAD ([${pr_head}](${github}${pr_head}))."
fi
fi
|
