FRIDGE-469 Change default branch naming (#391)

Author: ktoots

.github/workflows/build.yml

@@ -3,10 +3,10 @@ name: build
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   build:

.github/workflows/release.yml

@@ -1,25 +1,25 @@
 name: Release
 
-on: 
+on:
   workflow_dispatch:
     inputs:
       releaseVersion:
-        description: 'Release Version'     
+        description: "Release Version"
         required: true
       developmentVersion:
-        description: 'Next Development Version'     
+        description: "Next Development Version"
         required: true
- 
+
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
       - uses: actions/setup-node@v1
         with:
           node-version: 12.x
-          registry-url: 'https://registry.npmjs.org'      
-      - name : Bump to release version
+          registry-url: "https://registry.npmjs.org"
+      - name: Bump to release version
         run: |
           git config user.name flexrouting+ci
           git config user.email flexrouting+ci@twilio.com
@@ -32,15 +32,15 @@ jobs:
           git add -f dist
           git commit -m "${{ github.event.inputs.releaseVersion }}"
           git tag ${{ github.event.inputs.releaseVersion }}
-          git push origin HEAD:master --tags        
+          git push origin HEAD:main --tags        
           git checkout -B gh-pages
           find . -mindepth 1 -maxdepth 1 \( -name .gitignore -o -name node_modules -o -name dist -o -name .git \) -prune -o -exec rm -rf {} +
           mv dist/docs/* .
           rm -rf dist
           git add .
           git commit -am "${{ github.event.inputs.releaseVersion }}"
           git push origin gh-pages --force
-          git checkout master
+          git checkout main
           yarn publish --new-version "${{ github.event.inputs.releaseVersion }}"
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [release]
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
       - uses: actions/setup-node@v1
         with:
           node-version: 12.x
@@ -58,10 +58,10 @@ jobs:
         run: |
           git config user.name flexrouting+ci
           git config user.email flexrouting+ci@twilio.com
-          git pull origin HEAD:master          
+          git pull origin HEAD:main          
           yarn version --new-version "${{ github.event.inputs.developmentVersion }}" --no-git-tag-version
-          git pull origin HEAD:master
+          git pull origin HEAD:main
           git add .
           git rm -rf dist
           git commit -m "${{ github.event.inputs.developmentVersion }}"
-          git push origin HEAD:master --force
+          git push origin HEAD:main --force

README.md

@@ -10,84 +10,99 @@ TaskRouter is Twilio's skills based routing system. With this library, you can m
 
 This version of TaskRouter SDK can be used with Twilio Flex and TaskRouter standalone instances.
 
-Installation
-------------
+## Installation
 
 ### NPM
 
 ```
 npm install twilio-taskrouter
 ```
 
-Usage
------
+## Usage
 
 The following is a simple example showing a Worker waiting for Reservations.
 For more information, refer to the
 [API Docs](//twilio.github.io/twilio-taskrouter.js/index.html).
 
 ```js
-const TaskRouter = require('twilio-taskrouter');
-const Twilio = require('twilio');
+const TaskRouter = require("twilio-taskrouter");
+const Twilio = require("twilio");
 const AccessToken = Twilio.jwt.AccessToken;
 const TaskRouterGrant = AccessToken.TaskRouterGrant;
 
-const accountSid = '';
-const signingKeySid = '';
-const signingKeySecret = '';
-const workspaceSid = '';
-const workerSid = '';
-
-const token = createAccessToken(accountSid, signingKeySid, signingKeySecret, workspaceSid, workerSid);
+const accountSid = "";
+const signingKeySid = "";
+const signingKeySecret = "";
+const workspaceSid = "";
+const workerSid = "";
+
+const token = createAccessToken(
+  accountSid,
+  signingKeySid,
+  signingKeySecret,
+  workspaceSid,
+  workerSid
+);
 const alice = new TaskRouter.Worker(token);
 
-alice.on('ready', readyAlice => {
-    console.log(`Worker ${readyAlice.sid} is now ready for work`);
+alice.on("ready", (readyAlice) => {
+  console.log(`Worker ${readyAlice.sid} is now ready for work`);
 });
 
-alice.on('reservationCreated', reservation => {
-    console.log(`Reservation ${reservation.sid} has been created for ${alice.sid}`);
-    console.log(`Task attributes are: ${reservation.task.attributes}`);
+alice.on("reservationCreated", (reservation) => {
+  console.log(
+    `Reservation ${reservation.sid} has been created for ${alice.sid}`
+  );
+  console.log(`Task attributes are: ${reservation.task.attributes}`);
 
-    reservation.on('accepted', acceptedReservation => {
-      console.log(`Reservation ${acceptedReservation.sid} was accepted.`);
-    });
+  reservation.on("accepted", (acceptedReservation) => {
+    console.log(`Reservation ${acceptedReservation.sid} was accepted.`);
+  });
 
-    reservation.accept().then(acceptedReservation => {
+  reservation
+    .accept()
+    .then((acceptedReservation) => {
       console.log(`Reservation status is ${acceptedReservation.status}`);
-    }).catch((err) => {
+    })
+    .catch((err) => {
       console.log(`Error: ${err}`);
     });
 });
 
-function createAccessToken(accountSid, signingKeySid, signingKeySecret, workspaceSid, workerSid) {
-    const taskRouterGrant = new TaskRouterGrant({
-        workerSid: workerSid,
-        workspaceSid: workspaceSid,
-        role: 'worker'
-    });
-
-    const accessToken = new AccessToken(accountSid, signingKeySid, signingKeySecret);
-    accessToken.addGrant(taskRouterGrant);
-    accessToken.identity = 'alice';
-
-    return accessToken.toJwt();
+function createAccessToken(
+  accountSid,
+  signingKeySid,
+  signingKeySecret,
+  workspaceSid,
+  workerSid
+) {
+  const taskRouterGrant = new TaskRouterGrant({
+    workerSid: workerSid,
+    workspaceSid: workspaceSid,
+    role: "worker",
+  });
+
+  const accessToken = new AccessToken(
+    accountSid,
+    signingKeySid,
+    signingKeySecret
+  );
+  accessToken.addGrant(taskRouterGrant);
+  accessToken.identity = "alice";
+
+  return accessToken.toJwt();
 }
-
 ```
 
-Changelog
----------
+## Changelog
 
-See [CHANGELOG.md](https://github.com/twilio/twilio-taskrouter.js/blob/master/CHANGELOG.md).
+See [CHANGELOG.md](https://github.com/twilio/twilio-taskrouter.js/blob/main/CHANGELOG.md).
 
-License
--------
+## License
 
-See [LICENSE.md](https://github.com/twilio/twilio-taskrouter.js/blob/master/LICENSE.md).
+See [LICENSE.md](https://github.com/twilio/twilio-taskrouter.js/blob/main/LICENSE.md).
 
-Building
---------
+## Building
 
 Fork and clone the repository. Use npm to install node 8 (other versions may run into problems).
 
@@ -111,19 +126,18 @@ Before commits, be sure to validate by running:
 make lint
 ```
 
-Testing
-------------
+## Testing
+
 - Create a twilio account
 - copy ./test/integration_test_setup/.env.example to ./test/integration_test_setup/.env
 - set ACCOUNT_SID, AUTH_TOKEN, SIGNING_KEY_SID, SIGNING_KEY_SECRET
 - Run ./test/integration_test_setup/RunIntegrationTestLocal.sh this will create everything needed for running E2E tests and run the tests
 
-Test with Sample App
-------------
+## Test with Sample App
+
 - See [README.md](sample-app/README.md)
 
-Contributing
-------------
+## Contributing
 
 Bug fixes welcome! If you're not familiar with the GitHub pull
 request/contribution process, [this is a nice tutorial](https://gun.io/blog/how-to-github-fork-branch-and-pull-request/).