Skip to content

Commit d57d0ce

Browse files
Merge branch 'main' into HEAD
2 parents a5497fc + 13ff8fd commit d57d0ce

File tree

1,135 files changed

+263583
-301959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,135 files changed

+263583
-301959
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ build/ICUMessageParams.d.ts
2020
# Third-party files
2121
js/Mp3LameEncoder.min.js
2222
js/WebAudioRecorderMp3.js
23+
js/calling-tools/**
2324

2425
# TypeScript generated files
2526
app/**/*.js

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Remember, you can preview this before saving it.
1717
- [ ] My contribution is **not** related to translations.
1818
- [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/)
1919
- [ ] 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
20-
- [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/signalapp/Signal-Desktop/blob/main/CONTRIBUTING.md#tests))
20+
- [ ] A `npm run ready` run passes successfully ([more about tests here](https://github.com/signalapp/Signal-Desktop/blob/main/CONTRIBUTING.md#tests))
2121
- [ ] My changes are ready to be shipped to users
2222

2323
### Description

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
token: ${{ secrets.AUTOMATED_GITHUB_PAT }}
2121
repository: signalapp/Signal-Backport-Action-Private

.github/workflows/benchmark.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ on:
99
- main
1010
- '[0-9]+.[0-9]+.x'
1111
pull_request:
12+
schedule:
13+
- cron: '0 */12 * * *'
1214

1315
jobs:
1416
linux:
1517
runs-on: ubuntu-latest-8-cores
16-
if: ${{ github.repository == 'signalapp/Signal-Desktop-Private' }}
18+
if: ${{ github.repository == 'signalapp/Signal-Desktop-Private' && (!github.event.schedule || github.ref == 'refs/heads/main') }}
1719
timeout-minutes: 30
1820

1921
steps:
@@ -23,35 +25,35 @@ jobs:
2325
run: uname -a
2426

2527
- name: Clone Desktop repo
26-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2729

2830
- name: Setup node.js
29-
uses: actions/setup-node@v3
31+
uses: actions/setup-node@v4
3032
with:
31-
node-version: '20.9.0'
33+
node-version-file: '.nvmrc'
3234
- name: Install global dependencies
33-
35+
run: npm install -g [email protected]
3436

3537
- name: Install xvfb
3638
run: sudo apt-get install xvfb
3739

3840
- name: Cache Desktop node_modules
3941
id: cache-desktop-modules
40-
uses: actions/cache@v3
42+
uses: actions/cache@v4
4143
with:
4244
path: node_modules
43-
key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
45+
key: ${{ runner.os }}-${{ hashFiles('package.json', 'package-lock.json', 'patches/**') }}
4446

4547
- name: Install Desktop node_modules
4648
if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
47-
run: yarn install --frozen-lockfile
49+
run: npm ci
4850
env:
4951
NPM_CONFIG_LOGLEVEL: verbose
5052

5153
- name: Build typescript
52-
run: yarn generate
54+
run: npm run generate
5355
- name: Bundle
54-
run: yarn build:esbuild:prod
56+
run: npm run build:esbuild:prod
5557

5658
- name: Run startup benchmarks
5759
run: |
@@ -128,13 +130,13 @@ jobs:
128130

129131
- name: Upload benchmark logs on failure
130132
if: failure()
131-
uses: actions/upload-artifact@v3
133+
uses: actions/upload-artifact@v4
132134
with:
133135
name: logs
134136
path: artifacts
135137

136138
- name: Clone benchmark repo
137-
uses: actions/checkout@v3
139+
uses: actions/checkout@v4
138140
with:
139141
repository: 'signalapp/Signal-Desktop-Benchmarks-Private'
140142
path: 'benchmark-results'

0 commit comments

Comments
 (0)