From 4c8a2c1842551b64f557b2bc957cddcbdf2e11de Mon Sep 17 00:00:00 2001
From: kytwb <kytwb@pm.me>
Date: Sun, 2 Jan 2022 12:24:40 +0100
Subject: Revert "Revert "Upgrade system dependencies (node, npm, pnpm,
 node-gyp) (#2336)""

This reverts commit 712c2a4c237248b63d6553f557806d5dcce797f1.

# Conflicts:
#	.github/workflows/builds.yml
---
 .github/workflows/builds.yml             | 22 +++++++++++-----------
 .github/workflows/dependency-updates.yml |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 0a535376c..b570dbc44 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -47,11 +47,11 @@ jobs:
           submodules: recursive
           fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
           # ssh-key: ${{ secrets.FERDI_PUBLISH_TOKEN }}
-      - name: Use Node.js 16.13.0
+      - name: Use Node.js specified in the '.nvmrc' file
         uses: actions/setup-node@v2
         if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
         with:
-          node-version: 16.13.0
+          node-version-file: '.nvmrc'
       - id: should_run
         name: Check whether there are any commits since this run was last triggered and push them and/or set the output
         if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
@@ -134,14 +134,14 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Use Node.js 16.13.0
+      - name: Use Node.js specified in the '.nvmrc' file
         uses: actions/setup-node@v2
         with:
-          node-version: 16.13.0
+          node-version-file: '.nvmrc'
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.23.6
+          version: 6.24.1
       - name: Install node dependencies
         run: npm i
       - name: Package recipes
@@ -216,14 +216,14 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Use Node.js 16.13.0
+      - name: Use Node.js specified in the '.nvmrc' file
         uses: actions/setup-node@v2
         with:
-          node-version: 16.13.0
+          node-version-file: '.nvmrc'
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.23.6
+          version: 6.24.1
       - name: Install node dependencies
         run: npm i
       - name: Figure out used package.json version
@@ -301,14 +301,14 @@ jobs:
       - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off)
         run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
         shell: bash
-      - name: Use Node.js 16.13.0
+      - name: Use Node.js specified in the '.nvmrc' file
         uses: actions/setup-node@v2
         with:
-          node-version: 16.13.0
+          node-version-file: '.nvmrc'
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.23.6
+          version: 6.24.1
       - name: Install node dependencies
         uses: nick-invision/retry@v2.4.0
         with:
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index 7958aa5f5..eb69b049b 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -31,14 +31,14 @@ jobs:
         run: |
           echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
         shell: bash
-      - name: Use Node.js 16.13.0
+      - name: Use Node.js specified in the '.nvmrc' file
         uses: actions/setup-node@v2
         with:
-          node-version: 16.13.0
+          node-version-file: '.nvmrc'
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.23.6
+          version: 6.24.1
       - name: Install node dependencies
         run: npm i
       - name: Update submodules
-- 
cgit v1.2.3-54-g00ecf