Commit 6a87f7ed authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

Merge branch 'bandwidth' into 'master'

Reduce CI bandwidth requirements

See merge request !1570
parents 79aeba33 1378a407
Pipeline #199279 failed with stages
in 22 minutes and 5 seconds
......@@ -155,9 +155,8 @@ installed-tests:
# FIXME Install newer xdg-desktop-portal with
# GMemoryMonitor support, see:
# https://github.com/flatpak/xdg-desktop-portal/pull/365
- git clone --single-branch https://github.com/flatpak/xdg-desktop-portal.git
- git clone --branch 1.6.0 --depth 1 --no-tags https://github.com/flatpak/xdg-desktop-portal.git
- cd xdg-desktop-portal
- git reset --hard 1.6.0
- ./autogen.sh --prefix=/usr --libdir=/usr/lib64 --disable-libportal --disable-dependency-tracking
- make
- sudo make install
......@@ -165,7 +164,7 @@ installed-tests:
# FIXME install newer gobject-introspection
# with GMemoryMonitor support, see:
# https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/193
- git clone --single-branch https://gitlab.gnome.org/GNOME/gobject-introspection.git
- git clone --branch master --depth 1 --no-tags https://gitlab.gnome.org/GNOME/gobject-introspection.git
- cd gobject-introspection
- /usr/bin/meson _build --prefix=/usr --libdir=/usr/lib64
- ninja -C _build
......
......@@ -2,7 +2,7 @@
set -e
git clone https://gitlab.gnome.org/GNOME/glib.git
git clone --depth 1 --no-tags https://gitlab.gnome.org/GNOME/glib.git
meson subprojects download --sourcedir glib
rm glib/subprojects/*.wrap
mv glib/subprojects/ .
......
......@@ -2,11 +2,17 @@
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 upstream
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
......@@ -14,4 +20,11 @@ git fetch upstream
# `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` is only defined if we’re running in
# a merge request pipeline; fall back to `${CI_DEFAULT_BRANCH}` otherwise.
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 HEAD) | head -1)
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
./.gitlab-ci/check-todos.py "${newest_common_ancestor_sha}"
......@@ -2,21 +2,35 @@
set -e
ancestor_horizon=28 # days (4 weeks)
# Wrap everything in a subshell so we can propagate the exit status.
(
# 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 upstream
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`).
#
# `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` is only defined if we’re running in
# a merge request pipeline; fall back to `${CI_DEFAULT_BRANCH}` otherwise.
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 HEAD) | head -1)
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
git diff -U0 --no-color "${newest_common_ancestor_sha}" | ./clang-format-diff.py -binary "clang-format-7" -p1
)
......
......@@ -2,3 +2,4 @@
directory=gtk-doc
url=https://gitlab.gnome.org/GNOME/gtk-doc.git
revision=master
depth=1
......@@ -2,3 +2,4 @@
directory=libffi
url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git
revision=meson
depth=1
......@@ -2,3 +2,4 @@
directory=proxy-libintl
url=https://github.com/frida/proxy-libintl.git
revision=0.1
depth=1
......@@ -2,3 +2,4 @@
directory=sysprof
url=https://gitlab.gnome.org/GNOME/sysprof.git
revision=6b1cd7a722fcebae1ac392562c47957477ade8bf
depth=1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment