fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 06:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

automation: fetch NetworkManager's gitlab repository and add refs from merge-requests

Browse source 
Fetch both from github and gitlab, and also fetch the references for the
merge-requests/pull-requests.

In practice is github just a mirror of gitlab, so seemingly it wouldn't
make sense to fetch from there. However:

  - by adding github as a remote, we can preferably fetch from there.
    I think that is faster than our gitlab at freedesktop.org. Thank
    you, Microsoft!

  - pull requests against github are indeed not found in gitlab.

We need to fetch all kinds of remote references, so that the referenced
commits are in the git repository. Also, we need to fetch them under
various name, so that these references are available to CI.

For example, when someone opens a merge-request from their fork on
gitlab/github, the commit is usually not not referenced by regular
branches on gitlab/github. Hence, we couldn't schedule CI for those
commit. Also fetch the special references for these.

Also, don't use `timeout` to fetch the repository.
This commit is contained in:
Thomas Haller 2019-10-03 12:10:09 +02:00
parent 34a929f96e
commit 6c122534d6
1 changed files with 47 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
contrib/rh-bkr/build-from-source.sh
View file

@ -4,8 +4,7 @@ set -exv
BUILD_DIR="${BUILD_DIR:-$HOME/nm-build}"
BUILD_ID="${BUILD_ID:-master}"
BUILD_REPO="${BUILD_REPO-https://github.com/NetworkManager/NetworkManager.git}"
BUILD_REPO2="${BUILD_REPO2-git://github.com/NetworkManager/NetworkManager.git}"
BUILD_REPO="${BUILD_REPO}"
BUILD_SNAPSHOT="${BUILD_SNAPSHOT:-}"
ARCH="${ARCH:-`arch`}"
WITH_DEBUG="$WITH_DEBUG"
@ -92,28 +91,62 @@ fi
mkdir -p "$BUILD_DIR"
cd "$BUILD_DIR"
rm -rf "./NetworkManager"
if ! timeout 10m git clone "$BUILD_REPO"; then
git clone "$BUILD_REPO2"
BUILD_REPO_GITLAB="https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git"
BUILD_REPO_GITHUB="https://github.com/NetworkManager/NetworkManager.git"
if [ -z "$BUILD_REPO" ]; then
BUILD_REPO="$BUILD_REPO_GITLAB"
fi
rm -rf "./NetworkManager"
mkdir "./NetworkManager/"
cd "./NetworkManager/"
git init .
# enable randomization for unit-tests.
export NMTST_SEED_RAND=
git-setup-remote() {
local REMOTE="$1"
local MY_BUILD_REPO="$2"
# if we fetch from a github repository, we also care about the refs to the pull-requests
# fetch them too.
git config --add remote.origin.fetch '+refs/heads/*:refs/heads/*'
git config --add remote.origin.fetch '+refs/tags/*:refs/nmbuild-origin/tags/*'
git config --add remote.origin.fetch '+refs/pull/*:refs/nmbuild-origin/pull/*'
git remote add "$REMOTE" "$MY_BUILD_REPO"
git config remote."$REMOTE".tagOpt --no-tags
git config --unset-all remote."$REMOTE".fetch
git config --add remote."$REMOTE".fetch "+refs/heads/*:refs/remotes/$REMOTE/*"
git config --add remote."$REMOTE".fetch "+refs/heads/*:refs/nmbuild-$REMOTE/heads/*"
git config --add remote."$REMOTE".fetch "+refs/tags/*:refs/nmbuild-$REMOTE/tags/*"
if [ "$REMOTE" == origin ]; then
git config --add remote."$REMOTE".fetch '+refs/heads/*:refs/heads/*'
git config --add remote."$REMOTE".fetch "+refs/tags/*:refs/tags/*"
fi
if [ "$MY_BUILD_REPO" == "$BUILD_REPO_GITHUB" ]; then
git config --add remote."$REMOTE".fetch "+refs/pull/*/head:refs/remotes/$REMOTE/pr/*"
fi
if [ "$MY_BUILD_REPO" == "$BUILD_REPO_GITLAB" ]; then
git config --add remote."$REMOTE".fetch "+refs/merge-requests/*/head:refs/remotes/$REMOTE/pr/*"
fi
}
git-setup-remote origin "$BUILD_REPO"
git-setup-remote github "$BUILD_REPO_GITHUB"
if [ "$BUILD_REPO" != "$BUILD_REPO_GITLAB" ]; then
git-setup-remote gitlab "$BUILD_REPO_GITLAB"
fi
git -c user.email=bogus@nowhere.com -c user.name="Nobody Unperson" commit --allow-empty -m dummy-commit
git checkout HEAD^{}
git fetch origin --prune
git fetch github
git fetch --all
git show-ref
git checkout -B nmbuild "$BUILD_ID"
echo "HEAD is $(git rev-parse HEAD)"
# enable randomization for unit-tests.
export NMTST_SEED_RAND=
if [[ "$DO_TEST_BUILD" == yes ]]; then
NOCONFIGURE=yes ./autogen.sh