Skip to content
Snippets Groups Projects
Merged Daniel Juarez Gonzalez requested to merge make_commit_fail into master
1 file
+ 14
3
Compare changes
  • Side-by-side
  • Inline
+ 14
3
@@ -143,9 +143,17 @@ do
git config --global user.email "linux.support@cern.ch"
# We use kerberos as credentials
git clone https://:@gitlab.cern.ch:8443/linuxsupport/websites/linux.cern.ch.git "$TMPDIR"/documentation
if ! git clone https://:@gitlab.cern.ch:8443/linuxsupport/websites/linux.cern.ch.git "$TMPDIR"/documentation; then
echo "Could not clone repo"
exit 1
fi
cd "$TMPDIR"/documentation || exit 1
git checkout $BRANCH
if ! git checkout $BRANCH; then
echo "Could checkout $BRANCH"
exit 1
fi
mkdir -p $(dirname "$TMPDIR"/documentation/docs/$REPO_DEST_PATH/"$TODAY".md) && cp "$TMPDIR"/.updates $TMPDIR/documentation/docs/$REPO_DEST_PATH/$TODAY.md
git add "$TMPDIR"/documentation/docs/$REPO_DEST_PATH/"$TODAY".md
@@ -155,7 +163,10 @@ do
export GIT_MERGE_AUTOEDIT=no
# Merge made by the 'recursive' strategy. It does not conflict with other jobs
git pull
git push origin $BRANCH
if ! git push origin $BRANCH; then
echo "Could push to $BRANCH"
exit 1
fi
# Do not leave temp dir behind
rm -rf "$TMPDIR"
done
Loading