chore: set default branch to main

bennypowers · bennypowers · commit 8e16db4f435f · 2022-02-23T12:02:15.000-05:00
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
@@ -9,7 +9,6 @@ on:
       - labeled
       - closed
       - assigned
-      - connected
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -131,9 +131,9 @@ jobs:
             elements/
             tools/
 
-  # Validate the build to master was successful; open an issue if not
+  # Validate the build to main was successful; open an issue if not
   validate:
-    name: Validate successful build on master
+    name: Validate successful build on main
     needs:
       - build
       - test
@@ -182,8 +182,8 @@ jobs:
           project: 2  # The project-number from organization project
           column: Prioritized
           close-previous: true
-          title: "❌ Build is failing on master"
-          body: "It looks like the build is currently failing on the master branch. See failed [action results](https://github.com/patternfly/patternfly-elements/actions/runs/${{ github.run_id }}) for more details."
+          title: "❌ Build is failing on main"
+          body: "It looks like the build is currently failing on the main branch. See failed [action results](https://github.com/patternfly/patternfly-elements/actions/runs/${{ github.run_id }}) for more details."
       - name: Open issue if tests fail
         if: |
           github.event_name == 'push'
@@ -195,5 +195,7 @@ jobs:
           project: 2  # The project-number from organization project
           column: Prioritized
           close-previous: true
-          title: "🧪 Tests are failing on master"
-          body: "It looks like the build is currently failing on the master branch. See failed [action results](https://github.com/patternfly/patternfly-elements/actions/runs/${{ github.run_id }}) for more details."
+          title: "🧪 Tests are failing on main"
+          body: "It looks like the build is currently failing on the main branch. See failed [action results](https://github.com/patternfly/patternfly-elements/actions/runs/${{ github.run_id }}) for more details."
+
+
diff --git a/.github/workflows/visual-regression.yml b/.github/workflows/visual-regression.yml
@@ -6,14 +6,19 @@ on:
         description: Origin to test, e.g. https://deploy-preview-1804--patternfly-elements.netlify.app/
         required: true
       branch:
+        description: Branch being run on
         required: false
       issueNumber:
+        description: issue or pull request number being run for
         required: false
       netlifyBuildContext:
+        description: "The Netlify build context: https://docs.netlify.com/configure-builds/file-based-configuration/#deploy-contexts"
         required: false
       deployUrl:
+        description: The deploy url generated by netlify
         required: false
       url:
+        description: The url generated by netlify
         required: false
 
 jobs:
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -4,7 +4,14 @@ name: Move PR cards on project board
 
 on:
   pull_request:
-    types: [opened, closed, labeled, unlabeled, converted_to_draft, ready_for_review, review_requested]
+    types:
+      - opened
+      - closed
+      - labeled
+      - unlabeled
+      - converted_to_draft
+      - ready_for_review
+      - review_requested
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# PatternFly Elements [![Netlify status](https://api.netlify.com/api/v1/badges/bf40e3e7-4f98-4088-91d9-112dbe8a1872/deploy-status)](https://patternfly-elements.netlify.app) ![build status](https://img.shields.io/github/workflow/status/patternfly/patternfly-elements/Build%20&%20test/master) ![commit](https://badgen.net/github/last-commit/patternfly/patternfly-elements) ![latest version](https://img.shields.io/github/lerna-json/v/patternfly/patternfly-elements?label=version) ![contributors](https://img.shields.io/github/contributors/patternfly/patternfly-elements)
+# PatternFly Elements [![Netlify status](https://api.netlify.com/api/v1/badges/bf40e3e7-4f98-4088-91d9-112dbe8a1872/deploy-status)](https://patternfly-elements.netlify.app) ![build status](https://img.shields.io/github/workflow/status/patternfly/patternfly-elements/Build%20&%20test/main) ![commit](https://badgen.net/github/last-commit/patternfly/patternfly-elements) ![latest version](https://img.shields.io/github/lerna-json/v/patternfly/patternfly-elements?label=version) ![contributors](https://img.shields.io/github/contributors/patternfly/patternfly-elements)
 
 ## Table of Contents
 
diff --git a/docs/_includes/_foot.njk b/docs/_includes/_foot.njk
@@ -13,10 +13,10 @@
               <a href="https://github.com/patternfly/patternfly-elements">GitHub</a>
             </li>
             <li>
-              <a href="https://github.com/patternfly/patternfly-elements/blob/master/CONTRIBUTING.md">Contributing</a>
+              <a href="https://github.com/patternfly/patternfly-elements/blob/main/CONTRIBUTING.md">Contributing</a>
             </li>
             <li>
-              <a href="https://github.com/patternfly/patternfly-elements/blob/master/CODE_OF_CONDUCT.md">Code of
+              <a href="https://github.com/patternfly/patternfly-elements/blob/main/CODE_OF_CONDUCT.md">Code of
                 conduct</a>
             </li>
             <li>
diff --git a/docs/demo/demo.ts b/docs/demo/demo.ts
@@ -60,7 +60,7 @@ async function go(location = window.location) {
     viewer.hidden = false;
     document.title = `${pretty(element)} | PatternFly Elements`;
     document.querySelector('h1').textContent = `<${element}>`;
-    github.href = `https://github.com/patternfly/patternfly-elements/tree/master/${base}/${element}`;
+    github.href = `https://github.com/patternfly/patternfly-elements/tree/main/${base}/${element}`;
     toggleNav(false);
   } else {
     viewer.src = '';
diff --git a/docs/docs/develop/pull-request.md b/docs/docs/develop/pull-request.md
@@ -9,7 +9,12 @@ tags:
 1. Create a PR using the template provided, ensure all fields are filled out to the best of your ability.
 2. If you used the discovery template, please copy that content as necessary into the README.md for that component.
 3. Confirm that your component has all attributes and slots documented clearly in the schema and the README file.
-4. Update the commit log with a stub for your PR: `- [](https://github.com/patternfly/patternfly-elements/commit/) <name of commit> (#<PR number>)`.  **Please take the time to get the commit hash for the previous item in the list if one exists.**  You can find this by going to [https://github.com/patternfly/patternfly-elements/commits/master](https://github.com/patternfly/patternfly-elements/commits/master) or running `git log --pretty="%H - %s" -n 5` on the master branch.
+4. Update the commit log with a stub for your PR:
+  `- [](https://github.com/patternfly/patternfly-elements/commit/) <name of commit> (#<PR number>)`.
+  **Please take the time to get the commit hash for the previous item in the list if one exists.**
+  You can find this by going to
+  [https://github.com/patternfly/patternfly-elements/commits/main](https://github.com/patternfly/patternfly-elements/commits/main)
+  or running `git log --pretty="%H - %s" -n 5` on the main branch.
 5. Ensure someone has run through browser testing on all the listed environments in the PR template.
 6. Find someone to code review your branch.
-7. Once approved and all tests are passing, run a squash merge following [conventional commit standards](https://www.conventionalcommits.org) into master.
+7. Once approved and all tests are passing, run a squash merge following [conventional commit standards](https://www.conventionalcommits.org) into main.
diff --git a/docs/docs/develop/todo.md b/docs/docs/develop/todo.md
@@ -21,7 +21,7 @@ The items below represent in-code `// @TODO` notes we have left for ourselves to
     <tr>
       <td>{{ item.text }}</td>
       <td>
-        <a href="https://github.com/patternfly/patternfly-elements/blob/master/{{ item.file }}#L{{ item.line }}" target="_blank">{{ item.file }}:{{ item.line }}</a>
+        <a href="https://github.com/patternfly/patternfly-elements/blob/main/{{ item.file }}#L{{ item.line }}" target="_blank">{{ item.file }}:{{ item.line }}</a>
       </td>
     </tr> {%- endfor -%}
   </tbody>
diff --git a/docs/index.md b/docs/index.md
@@ -391,10 +391,10 @@ export default function App() {
               <a href="https://github.com/patternfly/patternfly-elements">GitHub</a>
             </li>
             <li>
-              <a href="https://github.com/patternfly/patternfly-elements/blob/master/CONTRIBUTING.md">Contributing</a>
+              <a href="https://github.com/patternfly/patternfly-elements/blob/main/CONTRIBUTING.md">Contributing</a>
             </li>
             <li>
-              <a href="https://github.com/patternfly/patternfly-elements/blob/master/CODE_OF_CONDUCT.md">Code of
+              <a href="https://github.com/patternfly/patternfly-elements/blob/main/CODE_OF_CONDUCT.md">Code of
                 conduct</a>
             </li>
             <li>
diff --git a/index.html b/index.html
@@ -26,7 +26,7 @@
   <header class="logo-bar">
     <button id="hamburger" aria-label="Expand Main Navigation">&#9776;</button>
     <a href="/"><img src="/brand/logo/svg/pfe-icon-white-shaded.svg" alt="" />PatternFly Elements</a>
-    <a id="github-link" href="https://github.com/patternfly/patternfly-elements/tree/master/elements/pfe-accordion">
+    <a id="github-link" href="https://github.com/patternfly/patternfly-elements/tree/main/elements/pfe-accordion">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512">
         <title>GitHub</title>
         <!-- Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
diff --git a/scripts/open-pr.js b/scripts/open-pr.js
@@ -54,7 +54,7 @@ inquirer
       type: 'input',
       name: 'base_branch',
       message: 'Base branch:',
-      default: 'master',
+      default: 'main',
       when: answers => answers.advanced_questions
     },
     {
@@ -70,5 +70,5 @@ inquirer
     const labels = getLabels(`./.github/PULL_REQUEST_TEMPLATE/${answers.template}`) || [];
 
     open(`https://github.com/patternfly/patternfly-elements/compare/${answers.base_branch ||
-    'master'}...${answers.pr_branch || branch.sync()}?template=${answers.template}&labels=${encodeURIComponent(labels.join(','))}`);
+    'main'}...${answers.pr_branch || branch.sync()}?template=${answers.template}&labels=${encodeURIComponent(labels.join(','))}`);
   });
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -42,10 +42,10 @@ cleanWorkspace() {
   [[ "$(git status --untracked-files=no --porcelain | wc -l | sed 's/ //g')" == 0 ]] || ( log "error: Release cannot continue because you have local changes.  Please commit or stash your changes and try again." && exit 1 )
 }
 
-checkoutMaster() {
-  log "checkout master branch & pull"
-  git checkout master || exit 1
-  git pull origin master || exit 1
+checkoutMain() {
+  log "checkout main branch & pull"
+  git checkout main || exit 1
+  git pull origin main || exit 1
 }
 
 bumpVersion() {
@@ -98,10 +98,10 @@ pushToOrigin() {
   git push --tags || exit 1
 }
 
-resetMaster() {
-  log "resetting master branch to origin/master"
-  git checkout master || exit 1
-  git reset --hard origin/master || exit 1
+resetMain() {
+  log "resetting main branch to origin/main"
+  git checkout main || exit 1
+  git reset --hard origin/main || exit 1
 }
 
 npmPublish() {
@@ -119,7 +119,7 @@ handlePR() {
   else
     log
     log "FINAL STEP:"
-    log "Follow this link to create a pull request, merging the release branch ($RELEASE_BRANCH) into master."
+    log "Follow this link to create a pull request, merging the release branch ($RELEASE_BRANCH) into main."
     log
     log "  https://github.com/patternfly/patternfly-elements/compare/$RELEASE_BRANCH?expand=1"
     log
@@ -128,16 +128,16 @@ handlePR() {
 }
 
 goodbye() {
-  log "Returning you to the master branch."
-  git checkout master
+  log "Returning you to the main branch."
+  git checkout main
 }
 
 # Only let user run this from repo root
 checkDir
 # Fail for uncommitted changes
 cleanWorkspace
-# check out the master branch
-checkoutMaster
+# check out the main branch
+checkoutMain
 # Set a lerna version, without tagging or pushing, using a prerelease id
 bumpVersion
 # Create a new "release branch" based on the changes made (versions) in last step
@@ -158,12 +158,12 @@ removeIgnoredFiles
 # and the tags (has build artifacts)
 # to the origin
 pushToOrigin
-# reset hard to master
-resetMaster
+# reset hard to main
+resetMain
 # checkout TAG_NAME and run lerna publish
 npmPublish
-# Open a PR to merge release branch into master
+# Open a PR to merge release branch into main
 # Even though the packages are already published
 handlePR
-# Checkout master
+# Checkout main
 goodbye

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-# PatternFly Elements [![Netlify status](https://api.netlify.com/api/v1/badges/bf40e3e7-4f98-4088-91d9-112dbe8a1872/deploy-status)](https://patternfly-elements.netlify.app) ![build status](https://img.shields.io/github/workflow/status/patternfly/patternfly-elements/Build%20&%20test/master) ![commit](https://badgen.net/github/last-commit/patternfly/patternfly-elements) ![latest version](https://img.shields.io/github/lerna-json/v/patternfly/patternfly-elements?label=version) ![contributors](https://img.shields.io/github/contributors/patternfly/patternfly-elements)
	`1`	+# PatternFly Elements [![Netlify status](https://api.netlify.com/api/v1/badges/bf40e3e7-4f98-4088-91d9-112dbe8a1872/deploy-status)](https://patternfly-elements.netlify.app) ![build status](https://img.shields.io/github/workflow/status/patternfly/patternfly-elements/Build%20&%20test/main) ![commit](https://badgen.net/github/last-commit/patternfly/patternfly-elements) ![latest version](https://img.shields.io/github/lerna-json/v/patternfly/patternfly-elements?label=version) ![contributors](https://img.shields.io/github/contributors/patternfly/patternfly-elements)
`2`	`2`
`3`	`3`	`## Table of Contents`
`4`	`4`