Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-23 01:48:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pr/5866

Browse Source
This commit is contained in:
Josh Perez
2022-05-04 21:28:12 -04:00
parent 3445e06b00 53c2305c4d
commit fb21285ce3
165 changed files with 4189 additions and 2541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/benchmark.yml vendored
View File

@@ -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

13
.github/workflows/ci.yml vendored
View File

@@ -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