Merge branch 'nightly' into release

1 files changed, 30 insertions, 33 deletions

diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index 062243659..bbd001a0a 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -120,17 +120,17 @@ jobs:
           cache-name: cache-node-modules
         with:
           path: ${{ env.NPM_CACHE }}
-          key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
-            ${{ runner.os }}-14.17-build-
+            ${{ runner.os }}-14.18-build-${{ env.cache-name }}-
+            ${{ runner.os }}-14.18-build-
       - name: Cache pnpm modules
         uses: actions/cache@v2
         env:
           cache-name: cache-pnpm-store
         with:
           path: ${{ env.PNPM_CACHE }}
-          key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
       - name: Cache electron modules
         uses: actions/cache@v2
         env:
@@ -145,21 +145,20 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Use Node.js 14.17.6
+      - name: Use Node.js 14.18.1
         uses: actions/setup-node@v2
         with:
-          node-version: 14.17.6
+          node-version: 14.18.1
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.16.0
+          version: 6.17.1
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
-          npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0
-          npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0
-      - name: Install node dependencies recursively
-        run: npx lerna bootstrap
+          npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0
+      - name: Install node dependencies
+        run: npm i
       - name: Package recipes
         run: pnpm i && pnpm run package
         working-directory: ./recipes
@@ -224,17 +223,17 @@ jobs:
           cache-name: cache-node-modules
         with:
           path: ${{ env.NPM_CACHE }}
-          key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
-            ${{ runner.os }}-14.17-build-
+            ${{ runner.os }}-14.18-build-${{ env.cache-name }}-
+            ${{ runner.os }}-14.18-build-
       - name: Cache pnpm modules
         uses: actions/cache@v2
         env:
           cache-name: cache-pnpm-store
         with:
           path: ${{ env.PNPM_CACHE }}
-          key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
       - name: Cache electron modules
         uses: actions/cache@v2
         env:
@@ -249,21 +248,20 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Use Node.js 14.17.6
+      - name: Use Node.js 14.18.1
         uses: actions/setup-node@v2
         with:
-          node-version: 14.17.6
+          node-version: 14.18.1
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.16.0
+          version: 6.17.1
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
-          npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0
-          npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0
-      - name: Install node dependencies recursively
-        run: npx lerna bootstrap
+          npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0
+      - name: Install node dependencies
+        run: npm i
       - name: Figure out used package.json version
         run: echo "PACKAGE_VERSION=$(node -p 'require("./package.json").version')" >> $GITHUB_ENV
         shell: bash
@@ -349,17 +347,17 @@ jobs:
           cache-name: cache-node-modules
         with:
           path: ${{ env.NPM_CACHE }}
-          key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
-            ${{ runner.os }}-14.17-build-
+            ${{ runner.os }}-14.18-build-${{ env.cache-name }}-
+            ${{ runner.os }}-14.18-build-
       - name: Cache pnpm modules
         uses: actions/cache@v2
         env:
           cache-name: cache-pnpm-store
         with:
           path: ${{ env.PNPM_CACHE }}
-          key: ${{ runner.os }}-14.17-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          key: ${{ runner.os }}-14.18-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
       - name: Cache electron modules
         uses: actions/cache@v2
         env:
@@ -374,22 +372,21 @@ jobs:
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
-      - name: Use Node.js 14.17.6
+      - name: Use Node.js 14.18.1
         uses: actions/setup-node@v2
         with:
-          node-version: 14.17.6
+          node-version: 14.18.1
       - name: Install pnpm
         uses: pnpm/action-setup@v2.0.1
         with:
-          version: 6.16.0
+          version: 6.17.1
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
-          npm ls -g node-gyp@8.1.0 || npm i -g node-gyp@8.1.0
-          npm ls -g lerna@4.0.0 || npm i -g lerna@4.0.0
+          npm ls -g node-gyp@8.2.0 || npm i -g node-gyp@8.2.0
         shell: bash
-      - name: Install node dependencies recursively
-        run: npx lerna bootstrap
+      - name: Install node dependencies
+        run: npm i
         shell: bash
       - name: Package recipes
         run: pnpm i && pnpm run package