[ARVADOS-DEV] updated: 805ab2183deb2e33e0fe64ddcebc6b6e728eac81

[Git user]

Summary of changes:
 git/hooks/coding-standards.rb         | 6 +++---
 jenkins/run-delete-merged-branches.sh | 2 +-
 jenkins/run-diagnostics-suite.sh      | 2 +-
 jenkins/run-performance-suite.sh      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

       via  805ab2183deb2e33e0fe64ddcebc6b6e728eac81 (commit)
      from  ff666732ebeeffe906e7346d86681ade9d1f8eef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 805ab2183deb2e33e0fe64ddcebc6b6e728eac81
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Jul 1 14:48:53 2021 -0400

    The bleeding edge branch on the arvados repo is now called 'main'.
    
    refs #17817
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/git/hooks/coding-standards.rb b/git/hooks/coding-standards.rb
index 14fb158..62c210f 100755
--- a/git/hooks/coding-standards.rb
+++ b/git/hooks/coding-standards.rb
@@ -54,8 +54,8 @@ puts "(#{$refname}) (#{$oldrev[0,6]}) (#{$newrev[0,6]})"
 $regex = /\[ref: (\d+)\]/
 
 $broken_commit_message = /Please enter a commit message to explain why this merge is necessary/
-$wrong_way_merge_main = /Merge( remote-tracking)? branch '([^\/]+\/)?master' into/
-$merge_main = /Merge branch '[^']+'((?! into)| into master)/
+$wrong_way_merge_main = /Merge( remote-tracking)? branch '([^\/]+\/)?main' into/
+$merge_main = /Merge branch '[^']+'((?! into)| into main)/
 $pull_merge = /Merge branch 'main' of /
 $refs_or_closes_or_no_issue = /(refs #|closes #|fixes #|no issue #)/i
 
@@ -86,7 +86,7 @@ def check_message_format
       no_ff = true
     elsif $pull_merge.match(message)
       puts "\n[POLICY] This appears to be a git pull merge of remote main into local"
-      puts "main.  In order to maintain a linear first-parent history of master,"
+      puts "main.  In order to maintain a linear first-parent history of main,"
       puts "please reset your branch and remerge or rebase using the latest main.\n"
       puts "\n******************************************************************\n"
       puts "\nOffending commit: #{rev}\n"
diff --git a/jenkins/run-delete-merged-branches.sh b/jenkins/run-delete-merged-branches.sh
index c2ecacb..fdab8e6 100755
--- a/jenkins/run-delete-merged-branches.sh
+++ b/jenkins/run-delete-merged-branches.sh
@@ -23,7 +23,7 @@ trap '_exit_handler $LINENO' EXIT ERR
 branches_to_keep="master|main|integration|dev|staging|.*\-dev"
 
 git remote update --prune
-git checkout master
+git checkout main
 git pull
 
 git branch --remote --merged | \
diff --git a/jenkins/run-diagnostics-suite.sh b/jenkins/run-diagnostics-suite.sh
index c2b9bb4..c7aaa9f 100755
--- a/jenkins/run-diagnostics-suite.sh
+++ b/jenkins/run-diagnostics-suite.sh
@@ -89,7 +89,7 @@ fi
 ECODE=$?
 
 if [[ "$REVISION" != '' ]]; then
-  git checkout master
+  git checkout main
 fi
 
 if [[ "$ECODE" != "0" ]]; then
diff --git a/jenkins/run-performance-suite.sh b/jenkins/run-performance-suite.sh
index e5c8093..24061b6 100755
--- a/jenkins/run-performance-suite.sh
+++ b/jenkins/run-performance-suite.sh
@@ -86,7 +86,7 @@ RAILS_ENV=performance bundle exec rake test:benchmark
 ECODE=$?
 
 if [[ "$REVISION" != '' ]]; then
-  git checkout master
+  git checkout main
 fi
 
 if [[ "$ECODE" != "0" ]]; then

-----------------------------------------------------------------------


hooks/post-receive
--