refactor: Update master branch mentioning to main (#1147)

azatsarynnyy · web-flow · commit 1031e2efb4f3 · 2021-06-18T20:57:50.000+03:00
* refactor: Update 'master' branch mentioning to 'main'

Signed-off-by: Artem Zatsarynnyi &lt;azatsary@redhat.com&gt;
diff --git a/.github/workflows/build-publish-next.yml b/.github/workflows/build-publish-next.yml
@@ -12,7 +12,7 @@ name: Build & Publish `next`
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
diff --git a/.github/workflows/publish-built-in-extension-report.yaml b/.github/workflows/publish-built-in-extension-report.yaml
@@ -13,7 +13,7 @@ name: publish
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron:  '0 1 * * *'
 jobs:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -61,7 +61,7 @@ In this section we are going to start a new workspace to work on che-theia. The
 The devfile could be started using `chectl`:
 
 ```
-chectl workspace:start -f https://raw.githubusercontent.com/eclipse-che/che-theia/master/devfiles/che-theia-all.devfile.yaml
+chectl workspace:start -f https://raw.githubusercontent.com/eclipse-che/che-theia/main/devfiles/che-theia-all.devfile.yaml
 ```
 At workspace start, Che will clone Theia and Che-theia.
 
@@ -78,7 +78,7 @@ $ che-theia init --dev
 
 This command will checkout all extensions in `/projects/theia/che` folder and create symbolic link into `/projects/theia/packages` folder.
 
-By default, extensions list is retrieved from https://github.com/eclipse-che/che-theia/blob/master/che-theia-init-sources.yml
+By default, extensions list is retrieved from https://github.com/eclipse-che/che-theia/blob/main/che-theia-init-sources.yml
 
 ### Step 3: Code che-theia extensions
 At this point you can code on che-theia extensions inside `/projects/theia/che/che-theia/extensions` folder. Extensions changes would be taken into account in the next step.
@@ -143,7 +143,7 @@ and run these plugins with the existing che-theia app:
 
 ## Che-Theia development on che.openshift.io
 
-There is a [devfile](https://github.com/eclipse-che/che-theia/blob/master/devfiles/hosted-che-dogfooding.devfile.yaml) to develop Che-Theia on [che.openshift.io](https://che.openshift.io)
+There is a [devfile](https://github.com/eclipse-che/che-theia/blob/main/devfiles/hosted-che-dogfooding.devfile.yaml) to develop Che-Theia on [che.openshift.io](https://che.openshift.io)
 
 Projects directory which is a Persistent Volume on [che.openshift.io](https://che.openshift.io) is limited to 1 gigabyte. It's not enough to build Che-Theia.
 The main idea is to use `/tmp/theia` directotry. Amount for this directory is limited to 3 gigabytes, which is enough to build Che-Theia and run.
@@ -153,7 +153,7 @@ In comparing with `/projects`, temporary directory is not persisted and is clear
 
 Use the badge to create a workspace using factory
 
-[![Try it on che.openshift.io](https://img.shields.io/static/v1?label=che&message=openshift.io&color=orange)](https://che.openshift.io/f?url=https://raw.githubusercontent.com/eclipse-che/che-theia/master/devfiles/hosted-che-dogfooding.devfile.yaml)
+[![Try it on che.openshift.io](https://img.shields.io/static/v1?label=che&message=openshift.io&color=orange)](https://che.openshift.io/f?url=https://raw.githubusercontent.com/eclipse-che/che-theia/main/devfiles/hosted-che-dogfooding.devfile.yaml)
 
 ### Step 1: Initialize Che-Theia in `/tmp/theia` directory
 
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <br/>
 <div id="che-theia-logo" align="center" style="vertical-align: middle">
 
-<img src="https://raw.githubusercontent.com/eclipse-che/che-theia/master/extensions/eclipse-che-theia-about/src/browser/style/che-logo-light.svg?sanitize=true" alt="Che Logo" width="200" height="60" />
+<img src="https://raw.githubusercontent.com/eclipse-che/che-theia/main/extensions/eclipse-che-theia-about/src/browser/style/che-logo-light.svg?sanitize=true" alt="Che Logo" width="200" height="60" />
 
 <img src="https://raw.githubusercontent.com/eclipse-theia/theia/master/logo/theia-logo.svg?sanitize=true" alt="Theia Logo" width="150" height="60"/>
 
@@ -22,7 +22,7 @@
 
 <div style='margin:0 auto;width:80%;'>
 
-![Che-Theia](https://raw.githubusercontent.com/eclipse-che/che-theia/master/che-theia-screenshot.png)
+![Che-Theia](https://raw.githubusercontent.com/eclipse-che/che-theia/main/che-theia-screenshot.png)
 
 </div>
 
@@ -80,15 +80,15 @@ The che-plugin of this editor is defined in the plugin registry https://github.c
 # Contributing
 
 ## Contribute to Che-theia
-Contributing to che-theia section is cover in [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/master/CONTRIBUTING.md)
+Contributing to che-theia section is cover in [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/main/CONTRIBUTING.md)
 
 
 ## Build container images
 
 Building images is required only if you make some changes on `Dockerfile`s inside `dockerfiles` folder.
-If it is about testing che-theia extensions or plugins, please refere to [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/master/CONTRIBUTING.md).
+If it is about testing che-theia extensions or plugins, please refere to [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/main/CONTRIBUTING.md).
 
-To build che-theia docker images, please follow [dockerfiles/theia/README.md](https://github.com/eclipse-che/che-theia/blob/master/dockerfiles/theia/README.md) instructions.
+To build che-theia docker images, please follow [dockerfiles/theia/README.md](https://github.com/eclipse-che/che-theia/blob/main/dockerfiles/theia/README.md) instructions.
 
 
 # License
diff --git a/RELEASE.md b/RELEASE.md
@@ -26,5 +26,5 @@ To make another bugfix release of Che-Theia with the upstream Theia patch includ
 ### Include a diff file
 It's also possible to use a diff file to patch the Theia while releasing Che-Theia:
 - prepare a `*.patch` file
-- put it into the [`patches`](https://github.com/eclipse-che/che-theia/tree/master/dockerfiles/theia/src/patches) folder and a sub-folder which name corresponds to the [`THEIA_VERSION`](https://github.com/eclipse-che/che-theia/blob/7.27.x/build.include#L15) value, e.g. `master`
+- put it into the [`patches`](https://github.com/eclipse-che/che-theia/tree/main/dockerfiles/theia/src/patches) folder and a sub-folder which name corresponds to the [`THEIA_VERSION`](https://github.com/eclipse-che/che-theia/blob/7.27.x/build.include#L15) value, e.g. `master`
 - continue the release process as usual
diff --git a/che-theia-init-sources.yml b/che-theia-init-sources.yml
@@ -33,4 +33,4 @@ sources:
     - plugins/telemetry-plugin
     - plugins/github-auth-plugin
     - plugins/recommendations-plugin
-  checkoutTo: master
+  checkoutTo: main
diff --git a/devfiles/hosted-che-dogfooding.devfile.yaml b/devfiles/hosted-che-dogfooding.devfile.yaml
@@ -27,7 +27,7 @@ projects:
     source:
       location: 'https://github.com/eclipse-che/che-theia.git'
       type: git
-      branch: master
+      branch: main
 
 components:
   - id: eclipse/che-theia/latest
diff --git a/dockerfiles/theia/README.md b/dockerfiles/theia/README.md
@@ -69,7 +69,7 @@ CI generates several tags of [docker images](https://quay.io/repository/eclipse/
 
 - `eclipse/che-theia:next`
   - theia branch: [master](https://github.com/theia-ide/theia/)
-  - che-theia branch: [master](https://github.com/eclipse-che/che-theia)
+  - che-theia branch: [main](https://github.com/eclipse-che/che-theia)
   - CI [build job](https://ci.centos.org/view/Devtools/job/devtools-che-theia-che-build-master/)
   - CI [nightly build job](https://ci.centos.org/view/Devtools/job/devtools-che-theia-che-nightly/)
 
diff --git a/generator/README.md b/generator/README.md
@@ -53,15 +53,15 @@ Also you can provide custom `yaml` with your extension set, by using `-c` or `--
 
 `che-theia init -c ./path/to/custom/che-theia-init-sources.yaml`
 
-The sample of `che-theia-init-sources.yaml` can be found [there](https://github.com/eclipse-che/che-theia/blob/master/che-theia-init-sources.yml)
+The sample of `che-theia-init-sources.yaml` can be found [there](https://github.com/eclipse-che/che-theia/blob/main/che-theia-init-sources.yml)
 
 ### Dev mode
 
-Dev mode is the way to use all new extensions from `master` branch:
+Dev mode is the way to use all new extensions from `main` branch:
 
 `che-theia init -d`
 
-And `che-theia` will use `master` branch for all extensions and plugins, regardless of provided configuration
+And `che-theia` will use `main` branch for all extensions and plugins, regardless of provided configuration
 
 ### Development life-cycle
 Che-Theia should be built from root directory only (Root directory of Che-Theia is the directory into which Theia was clonned and `che-theia init` was executed there). In case of building from subdirectories it will mess up dependencies, don't do it.
diff --git a/generator/src/init-sources.ts b/generator/src/init-sources.ts
@@ -32,7 +32,7 @@ export class InitSources {
     public static readonly PREFIX_PACKAGES_EXTENSIONS = '@che-';
 
     public static readonly DEFAULT_EXTENSIONS_URI =
-        'https://raw.githubusercontent.com/eclipse-che/che-theia/master/che-theia-init-sources.yml';
+        'https://raw.githubusercontent.com/eclipse-che/che-theia/master-main/che-theia-init-sources.yml';
     static argBuilder = (theYargs: yargs.Argv) =>
         theYargs
             .option('config', {
@@ -41,7 +41,7 @@ export class InitSources {
             })
             .option('dev', {
                 description:
-                    'Initialize current Theia with Che/Theia extensions from "master" branch instead of provided branches',
+                    'Initialize current Theia with Che/Theia extensions from "main" branch instead of provided branches',
                 alias: 'd',
                 type: 'boolean',
                 default: false,
@@ -105,7 +105,7 @@ export class InitSources {
         await Promise.all(
             extensionsYaml.sources.map(async (extension: ISource) => {
                 if (isDevMode) {
-                    extension.checkoutTo = 'master';
+                    extension.checkoutTo = 'main';
                 }
                 await this.addExtension(extension);
                 this.extensions.push(extension);
diff --git a/generator/tests/init-sources/init-sources.spec.ts b/generator/tests/init-sources/init-sources.spec.ts
@@ -75,7 +75,7 @@ describe('Test Extensions', () => {
     });
 
     function initGit(cwd: string) {
-        cp.execSync('git init', { cwd });
+        cp.execSync('git init -b main', { cwd });
         cp.execSync('git config --local user.name "test user"', { cwd });
         cp.execSync('git config --local user.email user@example.com', { cwd });
         cp.execSync(`git add ${cwd}`, { cwd });
@@ -105,7 +105,7 @@ describe('Test Extensions', () => {
                 },
                 {
                     source: 'file://' + sourceExtension2Tmp,
-                    checkoutTo: 'master',
+                    checkoutTo: 'main',
                 },
             ],
         };
@@ -234,7 +234,7 @@ describe('Test Extensions', () => {
                 },
                 {
                     source: 'file://' + sourceExtension2Tmp,
-                    checkoutTo: 'master',
+                    checkoutTo: 'main',
                 },
             ],
         };
@@ -289,7 +289,7 @@ describe('Test Extensions', () => {
                 },
                 {
                     source: 'file://' + sourceExtension2Tmp,
-                    checkoutTo: 'master',
+                    checkoutTo: 'main',
                 },
             ],
         };
@@ -383,7 +383,7 @@ describe('Test Extensions', () => {
 
         expect(yargsMockup.options['dev']).toEqual({
             description:
-                'Initialize current Theia with Che/Theia extensions from "master" branch instead of provided branches',
+                'Initialize current Theia with Che/Theia extensions from "main" branch instead of provided branches',
             alias: 'd',
             type: 'boolean',
             default: false,
@@ -409,7 +409,7 @@ describe('Test Extensions', () => {
                 },
                 {
                     source: 'file://' + sourceExtension2Tmp,
-                    checkoutTo: 'master',
+                    checkoutTo: 'main',
                 },
             ],
         };
diff --git a/make-release.sh b/make-release.sh
@@ -43,9 +43,9 @@ sed_in_place() {
 # derive branch from version
 BRANCH=${VERSION%.*}.x
 
-# if doing a .0 release, use master; if doing a .z release, use $BRANCH
+# if doing a .0 release, use main; if doing a .z release, use $BRANCH
 if [[ ${VERSION} == *".0" ]]; then
-  BASEBRANCH="master"
+  BASEBRANCH="main"
 else
   BASEBRANCH="${BRANCH}"
 fi
@@ -87,8 +87,8 @@ apply_files_edits () {
   fi
 
   # update config for Che-Theia generator
-  sed_in_place -e "/checkoutTo:/s/master/${BRANCH}/" che-theia-init-sources.yml
-  sed_in_place -e "/checkoutTo:/s/master/${BRANCH}/" che-theia-init-sources.yml
+  sed_in_place -e "/checkoutTo:/s/main/${BRANCH}/" che-theia-init-sources.yml
+  sed_in_place -e "/checkoutTo:/s/main/${BRANCH}/" che-theia-init-sources.yml
 
   # set the variables for building the images
   sed_in_place -e "s/IMAGE_TAG=\"..*\"/IMAGE_TAG=\"latest\"/" build.include
diff --git a/plugins/ext-plugin/README.md b/plugins/ext-plugin/README.md
@@ -12,4 +12,4 @@ if (eclipseCheExtPlugin) {
 }
 ```
 
-Exported code is coming from https://github.com/eclipse-che/che-theia/blob/master/extensions/eclipse-che-theia-plugin/src/che-proposed.d.ts
+Exported code is coming from https://github.com/eclipse-che/che-theia/blob/main/extensions/eclipse-che-theia-plugin/src/che-proposed.d.ts
diff --git a/plugins/workspace-plugin/.travis.yml b/plugins/workspace-plugin/.travis.yml
@@ -9,7 +9,7 @@ cache:
   - node_modules
 branches:
   only:
-  - master
+  - main
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- 
   - export PATH=$HOME/.yarn/bin:$PATH ;
@@ -27,7 +27,7 @@ jobs:
       - provider: script
         script: npm publish --access public
         on:
-          branch: master
+          branch: main
         skip_cleanup: true
       - provider: releases
         api-key: $GITHUB_AUTH_TOKEN
@@ -36,4 +36,4 @@ jobs:
         file: ./*.theia
         skip_cleanup: true
         on:
-          branch: master
+          branch: main
diff --git a/plugins/workspace-plugin/tests/devfile-service.spec.ts b/plugins/workspace-plugin/tests/devfile-service.spec.ts
@@ -331,7 +331,7 @@ describe('Devfile Service:', () => {
       ],
     });
 
-    await devfileService.updateProject('/projects/che-theia', 'https://github.com/eclipse-che/che-theia.git', 'master');
+    await devfileService.updateProject('/projects/che-theia', 'https://github.com/eclipse-che/che-theia.git', 'main');
 
     expect(getDevfileMock).toBeCalledTimes(1);
     expect(updateDevfileMock).toBeCalledTimes(1);
diff --git a/tools/automation/README.md b/tools/automation/README.md
@@ -1,6 +1,6 @@
 # Automation
 
-Che-theia makes use of theia built-in extensions, located [here](https://github.com/eclipse-theia/theia/blob/master/package.json). The corresponding che-theia list of extensions is located [here](https://github.com/eclipse-che/che-theia/blob/master/generator/src/templates/theiaPlugins.json).
+Che-theia makes use of theia built-in extensions, located [here](https://github.com/eclipse-theia/theia/blob/master/package.json). The corresponding che-theia list of extensions is located [here](https://github.com/eclipse-che/che-theia/blob/main/generator/src/templates/theiaPlugins.json).
 
 This directory contains various scripts which automate various maintenance steps of the registry.
 
diff --git a/tools/automation/package.json b/tools/automation/package.json
@@ -23,7 +23,7 @@
   "bugs": {
     "url": "https://github.com/eclipse/che/issues"
   },
-  "homepage": "https://github.com/eclipse-che/che-theia/blob/master/tools/automation/README.md",
+  "homepage": "https://github.com/eclipse-che/che-theia/blob/main/tools/automation/README.md",
   "dependencies": {
     "download": "^8.0.0",
     "fs-extra": "^9.0.1",
diff --git a/tools/devworkspace-handler/package.json b/tools/devworkspace-handler/package.json
@@ -32,7 +32,7 @@
   "bugs": {
     "url": "https://github.com/eclipse/che/issues"
   },
-  "homepage": "https://github.com/eclipse/che-theia/blob/master/tools/devworkspace-handler/README.md",
+  "homepage": "https://github.com/eclipse/che-theia/blob/main/tools/devworkspace-handler/README.md",
   "dependencies": {
     "@devfile/api": "latest",
     "axios": "0.21.1",

-Original file line number
+Diff line change
 on:
   push:
     branches:
 -      - master
 +      - main
 jobs:
   build: