2021-01-11 17:03:34 +01:00
|
|
|
|
#!/bin/bash
|
|
|
|
|
|
|
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
|
|
ancestor_horizon=28 # days (4 weeks)
|
|
|
|
|
|
|
|
|
|
|
|
# We need to add a new remote for the upstream target branch, since this script
|
|
|
|
|
|
# could be running in a personal fork of the repository which has out of date
|
|
|
|
|
|
# branches.
|
|
|
|
|
|
#
|
|
|
|
|
|
# Limit the fetch to a certain date horizon to limit the amount of data we get.
|
|
|
|
|
|
# If the branch was forked from origin/master before this horizon, it should
|
|
|
|
|
|
# probably be rebased.
|
|
|
|
|
|
git remote add upstream https://gitlab.gnome.org/GNOME/glib.git
|
|
|
|
|
|
git fetch --shallow-since="$(date --date="${ancestor_horizon} days ago" +%Y-%m-%d)" upstream
|
|
|
|
|
|
|
|
|
|
|
|
# Work out the newest common ancestor between the detached HEAD that this CI job
|
|
|
|
|
|
# has checked out, and the upstream target branch (which will typically be
|
|
|
|
|
|
# `upstream/master` or `upstream/glib-2-62`).
|
2021-01-11 17:04:52 +01:00
|
|
|
|
# `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` or `${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}`
|
|
|
|
|
|
# are only defined if we’re running in a merge request pipeline,
|
|
|
|
|
|
# fall back to `${CI_DEFAULT_BRANCH}` or `${CI_COMMIT_BRANCH}` respectively
|
|
|
|
|
|
# otherwise.
|
|
|
|
|
|
|
|
|
|
|
|
source_branch="${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-${CI_COMMIT_BRANCH}}"
|
|
|
|
|
|
git fetch --shallow-since="$(date --date="${ancestor_horizon} days ago" +%Y-%m-%d)" origin "${source_branch}"
|
|
|
|
|
|
|
|
|
|
|
|
newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent "origin/${source_branch}") | head -1)
|
2021-01-11 17:03:34 +01:00
|
|
|
|
if [ -z "${newest_common_ancestor_sha}" ]; then
|
|
|
|
|
|
echo "Couldn’t find common ancestor with upstream master. This typically"
|
|
|
|
|
|
echo "happens if you branched from master a long time ago. Please update"
|
|
|
|
|
|
echo "your clone, rebase, and re-push your branch."
|
|
|
|
|
|
exit 1
|
|
|
|
|
|
fi
|
