Update master references to main branch

deadeuzesse · Apr 27, 2021 · 473b353 · 473b353
1 parent 848ff3e
commit 473b353
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/staging-build-deploy.yml b/.github/workflows/staging-build-deploy.yml
@@ -3,7 +3,7 @@ name: Staging Build and Deploy
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 
 env:

diff --git a/content/documentation/variables.json b/content/documentation/variables.json
@@ -7,7 +7,7 @@
   "skipper-version": "2.7.0-SNAPSHOT",
   "dataflow-version": "2.8.0-SNAPSHOT",
 
-  "github-tag": "master",
+  "github-tag": "main",
 
   "spring-maven-repo-type": "snapshot",
 

diff --git a/content/versions.json b/content/versions.json
@@ -26,10 +26,10 @@
   },
   "2.8.0.SNAPSHOT": {
     "name": "2.8.0 SNAPSHOT",
-    "branch": "master"
+    "branch": "main"
   },
   "next": {
     "name": "next",
-    "branch": "master"
+    "branch": "main"
   }
 }
diff --git a/scripts/link-master.js b/scripts/link-master.js
@@ -7,9 +7,9 @@ const MASTER_DIR = path.join(__dirname, '../content/documentation')
 const DATA_DIR = path.join(__dirname, '../data')
 
 const linkMaster = async () => {
-  info('Linking master')
+  info('Linking main')
   linkFile(MASTER_DIR, path.join(DATA_DIR, 'next'))
-  linkFile(MASTER_DIR, path.join(DATA_DIR, 'master'))
+  linkFile(MASTER_DIR, path.join(DATA_DIR, 'main'))
 }
 
 const linkFile = (src, dest) => {
@@ -18,4 +18,4 @@ const linkFile = (src, dest) => {
   if (failed) throw new Error(`Couldn't link ${src} to ${dest}`)
 }
 
-main('link-master', linkMaster)
+main('link-main', linkMaster)
diff --git a/scripts/load-repos.js b/scripts/load-repos.js
@@ -17,7 +17,7 @@ const loadRepos = async () => {
   for (let versionId of Object.keys(versions)) {
     info(versionId)
     const version = versions[versionId]
-    if (version.branch === 'master') {
+    if (version.branch === 'main') {
       info(`Link version ${versionId} (name: ${version.name})`)
       linkFile(MASTER_DIR, path.join(DATA_DIR, versionId))
     } else {

diff --git a/src/components/common/layout/Navigations.js b/src/components/common/layout/Navigations.js
@@ -32,7 +32,7 @@ class Navigation extends React.Component {
     })
     let version = this.props.version ? this.props.version : currentVersion
     if (version === 'next') {
-      version = 'master'
+      version = 'main'
     }
     return (
       <>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Staging Build and Deploy @@
     on:
       push:
         branches:
-          - master
+          - main
       workflow_dispatch:
     env:
@@ Expand Down @@