all: prepare for renaming master branch to main (#910)

The actual change will happen "by hand" after this PR is merged. These are just preparatory steps which might well cause the build of the resulting PR squash and merge to fail, but subsequent builds will succeed.
govim · Jul 27, 2020 · 8e423df · 8e423df
1 parent 02d18f2
commit 8e423df
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/docker-based_tests.yml b/.github/workflows/docker-based_tests.yml
@@ -2,7 +2,7 @@
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
       - '**'

diff --git a/.github/workflows/vim_master.yml → .github/workflows/vim_main.yml b/.github/workflows/vim_master.yml → .github/workflows/vim_main.yml
@@ -3,7 +3,7 @@ on:
   schedule:
     - cron: '0 9 * * *'
 
-name: Vim Master Test
+name: Vim Main Test
 jobs:
   test:
     strategy:
@@ -21,5 +21,5 @@ jobs:
       with:
         stable: 'false'
         go-version: ${{ matrix.go-version }}
-    - name: Run master tests
-      run: ./_scripts/testVimMaster.sh
+    - name: Run main tests
+      run: ./_scripts/testVimMain.sh
diff --git a/_scripts/dockerRun.sh b/_scripts/dockerRun.sh
@@ -5,14 +5,14 @@ source "${BASH_SOURCE%/*}/common.bash"
 # This ensures that GitHub Actions properly runs the after_failure script
 trap 'set +ev' EXIT
 
-# We run race builds/tests on master branch. We also define that the RACE_BUILD
+# We run race builds/tests on main branch. We also define that the RACE_BUILD
 # environment variable be a comma-separated list of PR numbers (just the
 # number, no '#'), and if the CI build in question is a PR build whose number
 # is present in RACE_BUILD we also run race builds/tests.
 runRace=false
 if [[ "${CI:-}" == "true" ]]
 then
-	if [[ "${GITHUB_REF:-}" == "refs/heads/master" ]]
+	if [[ "${GITHUB_REF:-}" == "refs/heads/main" ]]
 	then
 		runRace=true
 	elif [[ "${GITHUB_EVENT_NAME:-}" == "pull_request" ]]

diff --git a/_scripts/tagDockerLatest.sh b/_scripts/tagDockerLatest.sh
@@ -3,15 +3,15 @@
 source "${BASH_SOURCE%/*}/common.bash"
 
 # Update the :latest tag for govim images. By default only runs on CI whilst
-# building against the master branch. This isn't totally foolproof, but good
+# building against the main branch. This isn't totally foolproof, but good
 # enough for what we need
 #
 # Usage:
 #
 #   _scripts/tagDockerLatest.sh [-f]
 #
 # The -f flag forces the update of latest, even when we aren't running on CI
-# against the master branch
+# against the main branch
 
 # Only run for the build matrix entry that corresponds to
 # the tag we are going to create
@@ -24,14 +24,14 @@ fi
 # If we are not on CI, then only run if -f is supplied
 if [[ "${CI:-}" != "true" ]] && [[ "${1:-}" != "-f" ]]
 then
-	echo "Cowardly refusing to tag :latest; not on CI building master branch, and no -f supplied"
+	echo "Cowardly refusing to tag :latest; not on CI building main branch, and no -f supplied"
 	exit 1
 fi
 
-# If we are on CI, only tag if we are on the master branch
-if [[ "${CI:-}" == "true" ]] && [[ "${GITHUB_REF:-}" != "refs/heads/master" ]]
+# If we are on CI, only tag if we are on the main branch
+if [[ "${CI:-}" == "true" ]] && [[ "${GITHUB_REF:-}" != "refs/heads/main" ]]
 then
-	echo "Skipping tagging of :latest docker image; we are not building master branch"
+	echo "Skipping tagging of :latest docker image; we are not building main branch"
 	exit 0
 fi
 

diff --git a/_scripts/testVimMaster.sh → _scripts/testVimMain.sh b/_scripts/testVimMaster.sh → _scripts/testVimMain.sh
diff --git a/github/actions/setupvim/action.yml b/github/actions/setupvim/action.yml
@@ -3,7 +3,7 @@ description: 'Setup Vim in your workflow'
 inputs:
   version:
     description: >
-      Version of Vim to install. Valid values are git refs (e.g. 'master', a branch name or commit hash)
+      Version of Vim to install. Valid values are git refs (e.g. 'main', a branch name or commit hash)
       or version tags (e.g. 'v8.2.0126')
     required: false
     default: 'master'

diff --git a/internal/cmd/genconfig/genconfig.go b/internal/cmd/genconfig/genconfig.go
@@ -152,7 +152,7 @@ func writeMaxVersionsScripts() {
 	}
 	vs.ValidFlavors = strings.Join(flavStrings, " ")
 	writeFileFromTmpl(filepath.Join("_scripts", "gen_maxVersions_genconfig.bash"), maxVersions, vs)
-	writeFileFromTmpl(".github/workflows/vim_master.yml", vimMasterYaml, vs)
+	writeFileFromTmpl(".github/workflows/vim_main.yml", vimMainYaml, vs)
 }
 
 // vimSemverCompare compares two Vim versions. Vim incorrectly puts leading
@@ -280,7 +280,7 @@ const dockerWorkflowYaml = `# Code generated by genconfig. DO NOT EDIT.
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
       - '**'
@@ -339,12 +339,12 @@ jobs:
         name: ${{ matrix.os }}_${{ matrix.go_version }}_${{ matrix.vim_flavor }}_${{ matrix.vim_version }}
 `
 
-const vimMasterYaml = `# Code generated by genconfig. DO NOT EDIT.
+const vimMainYaml = `# Code generated by genconfig. DO NOT EDIT.
 on:
   schedule:
     - cron: '0 9 * * *'
 
-name: Vim Master Test
+name: Vim Main Test
 jobs:
   test:
     strategy:
@@ -362,8 +362,8 @@ jobs:
       with:
         stable: 'false'
         go-version: ${{ matrix.go-version }}
-    - name: Run master tests
-      run: ./_scripts/testVimMaster.sh
+    - name: Run main tests
+      run: ./_scripts/testVimMain.sh
 `
 
 const maxVersions = `# Code generated by genconfig. DO NOT EDIT.
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     on:
       push:
         branches:
-          - master
+          - main
       pull_request:
         branches:
           - '**'
@@ Expand Down @@