Updated CI/CD

Author: ijlee2

.github/workflows/ci-cd.yml

@@ -3,7 +3,7 @@ name: CI/CD
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 env:
@@ -15,13 +15,13 @@ jobs:
   lint:
     name: Lint files and dependencies
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 3
     steps:
       - name: Check out a copy of the repo
         uses: actions/checkout@v2
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}
 
@@ -56,7 +56,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}
 
@@ -94,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     # Only run on pushes to main branch that aren't from the cron workflow
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     steps:
       - name: Check out a copy of the repo
         uses: actions/checkout@v2
@@ -110,7 +110,7 @@ jobs:
             "$(git config --local --get http.https://github.com/.extraheader)"
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ env.NODE_VERSION }}
 

CONTRIBUTING.md

@@ -32,7 +32,7 @@ This is an Ember app, so the usual steps follow:
 
 ## Deploying
 
-This site is deployed to [GitHub Pages](https://pages.github.com/) automatically from the `master` branch.
+This site is deployed to [GitHub Pages](https://pages.github.com/) automatically from the `main` branch.
 
 
 ## How It's Made

app/components/guide-section/subsection/template.hbs

@@ -19,7 +19,7 @@
       <a
         class="edit-translation-link"
         data-test-link="Edit Translation"
-        href="https://github.com/ember-learn/ember-octane-vs-classic-cheat-sheet/edit/master/translations/{{@sectionId}}/{{subsectionId}}/{{this.intl.locale}}.yaml"
+        href="https://github.com/ember-learn/ember-octane-vs-classic-cheat-sheet/edit/main/translations/{{@sectionId}}/{{subsectionId}}/{{this.intl.locale}}.yaml"
         rel="noopener noreferrer"
         target="_blank"
       >

tests/integration/components/guide-section/subsection/component-test.js

@@ -174,7 +174,7 @@ module('Integration | Component | guide-section/subsection', function(hooks) {
     `);
 
     assert.dom('[data-test-link="Edit Translation"]')
-      .hasAttribute('href', 'https://github.com/ember-learn/ember-octane-vs-classic-cheat-sheet/edit/master/translations/generating-files/generating-component/en-us.yaml')
+      .hasAttribute('href', 'https://github.com/ember-learn/ember-octane-vs-classic-cheat-sheet/edit/main/translations/generating-files/generating-component/en-us.yaml')
   });
 
   test('should render (5)', async function(assert) {
@@ -199,6 +199,6 @@ module('Integration | Component | guide-section/subsection', function(hooks) {
     `);
 
     assert.dom('[data-test-link="Edit Translation"]')
-      .hasAttribute('href', 'https://github.com/ember-learn/ember-octane-vs-classic-cheat-sheet/edit/master/translations/generating-files/generating-component/pt-br.yaml')
+      .hasAttribute('href', 'https://github.com/ember-learn/ember-octane-vs-classic-cheat-sheet/edit/main/translations/generating-files/generating-component/pt-br.yaml')
   });
 });