Merge branch 'main' into pr/5866

.github/ISSUE_TEMPLATE/config.yml

@@ -16,7 +16,7 @@ contact_links:
     url: https://community.signalusers.org/c/support/
     about: Feel free to ask anything
   - name: 📖 Contribution instructions
-    url: https://github.com/signalapp/Signal-Desktop/blob/development/CONTRIBUTING.md
+    url: https://github.com/signalapp/Signal-Desktop/blob/main/CONTRIBUTING.md
     about: Want to contribute to Signal Desktop? Start here.
   - name: ❓ Other issue?
     url: https://community.signalusers.org/

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,7 +16,7 @@ Remember, you can preview this before saving it.
 
 - [ ] My contribution is **not** related to translations. _Please submit translation changes via our [Signal Desktop Transifex project](https://www.transifex.com/signalapp/signal-desktop/)._
 - [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/)
-- [ ] My changes are [rebased](https://medium.com/free-code-camp/git-rebase-and-the-golden-rule-explained-70715eccc372) on the latest [`development`](https://github.com/signalapp/Signal-Desktop/tree/development) branch
+- [ ] My changes are [rebased](https://medium.com/free-code-camp/git-rebase-and-the-golden-rule-explained-70715eccc372) on the latest [`main`](https://github.com/signalapp/Signal-Desktop/tree/main) branch
 - [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/signalapp/Signal-Desktop/blob/master/CONTRIBUTING.md#tests))
 - [ ] My changes are ready to be shipped to users
 

.github/workflows/benchmark.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - development
+      - main
       - '[0-9]+.[0-9]+.x'
   pull_request:
 
@@ -27,7 +28,7 @@ jobs:
     - name: Setup node.js
       uses: actions/setup-node@v2
       with:
-        node-version: '16.13.0'
+        node-version: '16.13.2'
     - name: Install global dependencies
       run: npm install -g yarn@1.22.10
 

.github/workflows/ci.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - development
+      - main
       - '[0-9]+.[0-9]+.x'
   pull_request:
 
@@ -20,7 +21,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
       with:
-        node-version: '16.13.0'
+        node-version: '16.13.2'
     - run: npm install -g yarn@1.22.10
 
     - name: Cache Desktop node_modules
@@ -42,7 +43,7 @@ jobs:
   macos:
     needs: lint
     runs-on: macos-11.0
-    if: github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
     timeout-minutes: 30
 
     steps:
@@ -50,7 +51,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
       with:
-        node-version: '16.13.0'
+        node-version: '16.13.2'
     - run: npm install -g yarn@1.22.10
 
     - name: Cache Desktop node_modules
@@ -88,7 +89,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
       with:
-        node-version: '16.13.0'
+        node-version: '16.13.2'
     - run: sudo apt-get install xvfb
     - run: npm install -g yarn@1.22.10
 
@@ -129,7 +130,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
       with:
-        node-version: '16.13.0'
+        node-version: '16.13.2'
     - run: npm install -g yarn@1.22.10
 
     - name: Cache Desktop node_modules
@@ -175,7 +176,7 @@ jobs:
     - name: Setup node.js
       uses: actions/setup-node@v2
       with:
-        node-version: '16.13.0'
+        node-version: '16.13.2'
     - name: Install global dependencies
       run: npm install -g yarn@1.22.10