chore: resolve merge conflicts

.github/workflows/ci.yml

@@ -1,59 +1,69 @@
-name: ci
+name: CI
 
 on:
+  pull_request:
   push:
-    branches:
-      - main
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        node:
+          - 12
+          - 14
+          - 16
+          - 17
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v1
+    steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/[email protected]
         with:
-          node-version: '10.x'
+          access_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/cache@v2
-        id: npm-cache
+      - name: ⬇️ Checkout
+        uses: actions/checkout@v2
+
+      - name: ⎔ Setup node ${{ matrix.node }}
+        uses: actions/setup-node@v2
         with:
-          path: node_modules
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-
+          node-version: ${{ matrix.node }}
+          cache: npm
 
-      - name: Install dependencies
-        if: steps.npm-cache.outputs.cache-hit != 'true'
-        run: npm install
+      - name: 📥 Download deps
+        run: npm ci
 
-      - name: Run tests
-        run: npm run test
+      - name: Test
+        run: npm test
 
   publish:
     runs-on: ubuntu-latest
     needs: ['test']
+    strategy:
+      fail-fast: false
+      matrix:
+        node:
+          - 12
+          - 14
+          - 16
+          - 17
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '10.x'
-
-      - uses: actions/cache@v2
-        id: npm-cache
+      - name: ⎔ Setup node ${{ matrix.node }}
+        uses: actions/setup-node@v2
         with:
-          path: node_modules
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-
+          node-version: ${{ matrix.node }}
+          cache: npm
 
-      - name: Install dependencies
-        if: steps.npm-cache.outputs.cache-hit != 'true'
-        run: npm install
+      - name: 📥 Download deps
+        run: npm ci
 
-      - name: Release and Publish to NPM
+      - name: 🚀 Release and publish to npm
         run: npx semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -78,7 +78,7 @@ Like commitizen, you specify the configuration of cz-conventional-changelog thro
 
 ### Environment variables
 
-The following environment varibles can be used to override any default configuration or package.json based configuration.
+The following environment variables can be used to override any default configuration or package.json based configuration.
 
 - CZ_TYPE = defaultType
 - CZ_SCOPE = defaultScope