#!/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/main before this horizon, it should # probably be rebased. if ! git ls-remote --exit-code upstream >/dev/null 2>&1 ; then git remote add upstream https://gitlab.gnome.org/GNOME/pika.git fi git fetch --shallow-since="$(date --date="${ancestor_horizon} days ago" +%Y-%m-%d)" upstream &> ./fetch_upstream.log # 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/main` or `upstream/glib-2-62`). # `${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. # add mr-origin git remote add mr-origin ${CI_MERGE_REQUEST_SOURCE_PROJECT_URL} source_branch="${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-${CI_COMMIT_BRANCH}}" git fetch --shallow-since="$(date --date="${ancestor_horizon} days ago" +%Y-%m-%d)" mr-origin "${source_branch}" &> ./fetch_origin.log 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 "mr-origin/${source_branch}") | head -1) if [ -z "${newest_common_ancestor_sha}" ]; then echo "Couldn’t find common ancestor with upstream main branch. This typically" echo "happens if you branched from main a long time ago. Please update" echo "your clone, rebase, and re-push your branch." exit 1 fi