jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5976

This commit is contained in:
Fedor Indutnyy 2022-08-24 10:43:04 -07:00
parent 2237f08507 a1a4024079
commit 7d36e4ce35
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/backport.yml vendored
View File

@ -1,4 +1,4 @@
# Copyright 2021 Signal Messenger, LLC
# Copyright 2021-2022 Signal Messenger, LLC
# SPDX-License-Identifier: AGPL-3.0-only
name: Backport
@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
token: ${{ secrets.AUTOMATED_GITHUB_PAT }}
repository: signalapp/Signal-Backport-Action-Private

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

@ -23,10 +23,10 @@ jobs:
run: uname -a
- name: Clone Desktop repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.13.2'
- name: Install global dependencies
@ -37,7 +37,7 @@ jobs:
- name: Cache Desktop node_modules
id: cache-desktop-modules
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
@ -106,13 +106,13 @@ jobs:
- name: Upload benchmark logs on failure
if: failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: logs
path: artifacts
- name: Clone benchmark repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: 'signalapp/Signal-Desktop-Benchmarks-Private'
path: 'benchmark-results'

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

@ -18,15 +18,15 @@ jobs:
steps:
- run: lsb_release -a
- run: uname -a
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.13.2'
- run: npm install -g yarn@1.22.10
- name: Cache Desktop node_modules
id: cache-desktop-modules
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
@ -42,21 +42,21 @@ jobs:
macos:
needs: lint
runs-on: macos-11.0
runs-on: macos-11
if: github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
timeout-minutes: 30
steps:
- run: uname -a
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.13.2'
- run: npm install -g yarn@1.22.10
- name: Cache Desktop node_modules
id: cache-desktop-modules
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
@ -86,8 +86,8 @@ jobs:
steps:
- run: lsb_release -a
- run: uname -a
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.13.2'
- run: sudo apt-get install xvfb
@ -95,7 +95,7 @@ jobs:
- name: Cache Desktop node_modules
id: cache-desktop-modules
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
@ -127,15 +127,15 @@ jobs:
- run: systeminfo
- run: git config --global core.autocrlf false
- run: git config --global core.eol lf
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.13.2'
- run: npm install -g yarn@1.22.10
- name: Cache Desktop node_modules
id: cache-desktop-modules
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
@ -171,10 +171,10 @@ jobs:
run: uname -a
- name: Clone Desktop repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.13.2'
- name: Install global dependencies
@ -185,7 +185,7 @@ jobs:
- name: Cache Desktop node_modules
id: cache-desktop-modules
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}