update_version_svn (IGNORE_BRANCHES): Add gcc-6-branch.

	* update_version_svn (IGNORE_BRANCHES): Add gcc-6-branch.
	* crontab: Remove gcc-6-branch entry.

From-SVN: r265527

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index db6cffe56ae551920318139d283c561e919a24ad..3b67a7814175443482f0062922e4cbd9ce838939 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,5 +1,8 @@
 2018-10-26  Jakub Jelinek  <jakub@redhat.com>
 
+       * update_version_svn (IGNORE_BRANCHES): Add gcc-6-branch.
+       * crontab: Remove gcc-6-branch entry.
+
        * gcc_release (error, inform): Use $@ instead of $1.
        (build_sources): Check for ^[[:blank:]]*GCC in both index.html
        and changes.html, rather than for GCC in one and ^GCC in another one.

diff --git a/maintainer-scripts/crontab b/maintainer-scripts/crontab
index 67c18b8a0001ff7d27406cbd01ea415adff3aaef..098aaffd0c3423071b9e558bd01fb237b9057d79 100644 (file)
--- a/maintainer-scripts/crontab
+++ b/maintainer-scripts/crontab
@@ -1,7 +1,6 @@
 16  0 * * * sh /home/gccadmin/scripts/update_version_svn
 50  0 * * * sh /home/gccadmin/scripts/update_web_docs_svn
 55  0 * * * sh /home/gccadmin/scripts/update_web_docs_libstdcxx_svn
-32 22 * * 3 sh /home/gccadmin/scripts/gcc_release -s 6:branches/gcc-6-branch -l -d /sourceware/snapshot-tmp/gcc all
 32 22 * * 4 sh /home/gccadmin/scripts/gcc_release -s 7:branches/gcc-7-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
 32 22 * * 7 sh /home/gccadmin/scripts/gcc_release -s 9:trunk -l -d /sourceware/snapshot-tmp/gcc all

diff --git a/maintainer-scripts/update_version_svn b/maintainer-scripts/update_version_svn
index e83757ca1f8ebd00b10fa8bcd40e69f21a471d3d..1f4fc2088509a33231535db4f4c1b1344a966072 100755 (executable)
--- a/maintainer-scripts/update_version_svn
+++ b/maintainer-scripts/update_version_svn
@@ -6,7 +6,7 @@
 # in the space separated list in $ADD_BRANCHES.
 
 SVNROOT=${SVNROOT:-"file:///svn/gcc"}
-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)-branch'
+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)-branch'
 ADD_BRANCHES='HEAD'
 
 # Run this from /tmp.