Commit 18cb6ac2 by Joseph Myers

Replace update_version_svn with update_version_git.

This patch replaces the update_version_svn script, that updates the
DATESTAMP files from cron, with update_version_git.

	* update_version_git: New file.
	* update_version:svn: Remove.
	* crontab: Use update_version_git.
parent b2b465c5
2020-01-13 Joseph Myers <joseph@codesourcery.com>
* update_version_git: New file.
* update_version:svn: Remove.
* crontab: Use update_version_git.
2019-11-20 Janne Blomqvist <jb@gcc.gnu.org> 2019-11-20 Janne Blomqvist <jb@gcc.gnu.org>
* gcc_release: Use https for gcc.gnu.org. * gcc_release: Use https for gcc.gnu.org.
......
16 0 * * * sh /home/gccadmin/scripts/update_version_svn 16 0 * * * sh /home/gccadmin/scripts/update_version_git
50 0 * * * sh /home/gccadmin/scripts/update_web_docs_svn 50 0 * * * sh /home/gccadmin/scripts/update_web_docs_svn
55 0 * * * sh /home/gccadmin/scripts/update_web_docs_libstdcxx_svn 55 0 * * * sh /home/gccadmin/scripts/update_web_docs_libstdcxx_svn
32 22 * * 5 sh /home/gccadmin/scripts/gcc_release -s 8:branches/gcc-8-branch -l -d /sourceware/snapshot-tmp/gcc all 32 22 * * 5 sh /home/gccadmin/scripts/gcc_release -s 8:branches/gcc-8-branch -l -d /sourceware/snapshot-tmp/gcc all
......
#!/bin/sh #!/bin/sh
# #
# Update the current version date in all files in the tree containing # Update the current version date in all files in the tree containing
# it. Consider all release branches except those matching the regular # it. Consider all single-component-version release branches except
# expression in $IGNORE_BRANCHES, and also consider those branches listed # those matching the regular expression in $IGNORE_BRANCHES, and also
# in the space separated list in $ADD_BRANCHES. # consider those branches listed in the space separated list in
# $ADD_BRANCHES.
SVNROOT=${SVNROOT:-"file:///svn/gcc"} GITROOT=${GITROOT:-"/git/gcc.git"}
IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3|3_4|4_0|4_1|4_2|4_3|4_4|4_5|4_6|4_7|4_8|4_9|5|6|7)-branch' IGNORE_BRANCHES='releases/gcc-(.*\..*|5|6|7)'
ADD_BRANCHES='HEAD' ADD_BRANCHES='master'
# Run this from /tmp. # Run this from /tmp.
export SVNROOT export GITROOT
/bin/rm -rf /tmp/$$ BASEDIR=/tmp/$$
/bin/mkdir /tmp/$$ /bin/rm -rf "$BASEDIR"
cd /tmp/$$ /bin/mkdir "$BASEDIR"
cd "$BASEDIR"
SVN=${SVN:-/usr/bin/svn} GIT=${GIT:-/usr/local/bin/git}
# Compute the branches which we should update. # Compute the branches which we should update.
BRANCHES=`$SVN ls $SVNROOT/branches \ BRANCHES=`(cd $GITROOT \
| sed -e 's/\///' \ && ${GIT} for-each-ref --format='%(refname)' \
| egrep 'gcc-[0-9]+(_[0-9]+)?-branch$' \ 'refs/heads/releases/gcc-*') \
| sed -e 's/refs\/heads\///' \
| egrep -v $IGNORE_BRANCHES` | egrep -v $IGNORE_BRANCHES`
# Always update the mainline. # Always update the mainline.
BRANCHES="${BRANCHES} ${ADD_BRANCHES}" BRANCHES="${ADD_BRANCHES} ${BRANCHES}"
# This is put into the datestamp files. # This is put into the datestamp files.
CURR_DATE=`/bin/date +"%Y%m%d"` CURR_DATE=`/bin/date +"%Y%m%d"`
...@@ -33,28 +36,25 @@ datestamp_FILES="gcc/DATESTAMP" ...@@ -33,28 +36,25 @@ datestamp_FILES="gcc/DATESTAMP"
# Assume all will go well. # Assume all will go well.
RESULT=0 RESULT=0
SUBDIR=$BASEDIR/gcc
for BRANCH in $BRANCHES; do for BRANCH in $BRANCHES; do
echo "Working on \"$BRANCH\"." echo "Working on \"$BRANCH\"."
# Check out the files on the branch. HEAD is in a different namespace. # Check out the files on the branch.
if test "$BRANCH" = HEAD; then if [ -d "$SUBDIR" ]; then
SVNROOT2=${SVNROOT}/trunk cd "$SUBDIR"
else ${GIT} pull -q
SVNROOT2=${SVNROOT}/branches/${BRANCH} ${GIT} checkout -q "$BRANCH"
else
${GIT} clone -q -b "$BRANCH" "$GITROOT" "$SUBDIR"
fi fi
for i in $datestamp_FILES; do
${SVN} -q co -N ${SVNROOT2}/`dirname $i` `basename $i`
done
# There are no files to commit yet. # There are no files to commit yet.
COMMIT_FILES="" COMMIT_FILES=""
cd "$SUBDIR"
for file in $datestamp_FILES; do for file in $datestamp_FILES; do
dirname=`basename $file`
file=`basename $file`
file="$dirname/$file"
if test -f $file; then if test -f $file; then
echo ${CURR_DATE} > $file.new echo "${CURR_DATE}" > $file.new
if /usr/bin/cmp -s $file $file.new; then if /usr/bin/cmp -s $file $file.new; then
rm -f $file.new rm -f $file.new
...@@ -68,18 +68,18 @@ for BRANCH in $BRANCHES; do ...@@ -68,18 +68,18 @@ for BRANCH in $BRANCHES; do
if test -n "$COMMIT_FILES"; then if test -n "$COMMIT_FILES"; then
for i in $COMMIT_FILES; do for i in $COMMIT_FILES; do
echo "Attempting to commit $i" echo "Attempting to commit $i"
if ! ${SVN} commit -m "Daily bump." $i; then if ${GIT} commit -m "Daily bump." $i; then
# If we could not commit the files, indicate failure. if ! ${GIT} push origin "$BRANCH"; then
RESULT=1 # If we could not push the files, indicate failure.
fi RESULT=1
fi
else
# If we could not commit the files, indicate failure.
RESULT=1
fi
done done
fi fi
# Remove the files.
for i in $datestamp_FILES; do
rm -rf /tmp/$$/`basename $i`
done
done done
/bin/rm -rf /tmp/$$ /bin/rm -rf $BASEDIR
exit $RESULT exit $RESULT
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