From a22d51b7c7c44f5dad20dea5f9383e5c27636b53 Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Fri, 17 Jun 2022 13:47:57 +0100 Subject: [PATCH 1/3] ci: update github actions --- .github/workflows/backport.yml | 2 +- .github/workflows/benchmark.yml | 10 +++++----- .github/workflows/ci.yml | 30 +++++++++++++++--------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 8e1206af6..45184703c 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -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 diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index f38af114f..6783a3c58 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -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' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffa7348eb..b3d5b2ce0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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/**') }} @@ -48,15 +48,15 @@ jobs: 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/**') }} From e5e93c609c62a5f6d0ba11c237ec95403f9e22cb Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Fri, 17 Jun 2022 13:48:38 +0100 Subject: [PATCH 2/3] ci: fix invalid runner name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3d5b2ce0..4d7eec62a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ 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 From a1a4024079626ddd910926570c449d572152eb2c Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Thu, 4 Aug 2022 08:39:21 +0100 Subject: [PATCH 3/3] ci(backport): update copyright year --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 45184703c..dae376149 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -1,4 +1,4 @@ -# Copyright 2021 Signal Messenger, LLC +# Copyright 2021-2022 Signal Messenger, LLC # SPDX-License-Identifier: AGPL-3.0-only name: Backport