aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/dependency-updates.yml4
-rw-r--r--.github/workflows/ferdi-builds.yml12
-rw-r--r--.nvmrc2
-rw-r--r--package.json2
4 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index 85be25021..1f1a89e06 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -41,10 +41,10 @@ jobs:
41 ${{ runner.os }}-build-${{ env.cache-name }}- 41 ${{ runner.os }}-build-${{ env.cache-name }}-
42 ${{ runner.os }}-build- 42 ${{ runner.os }}-build-
43 ${{ runner.os }}- 43 ${{ runner.os }}-
44 - name: Use Node.js 14.16.1 44 - name: Use Node.js 14.17.3
45 uses: actions/setup-node@v2 45 uses: actions/setup-node@v2
46 with: 46 with:
47 node-version: 14.16.1 47 node-version: 14.17.3
48 - name: Uninstall locally and reinstall node-gyp globally 48 - name: Uninstall locally and reinstall node-gyp globally
49 run: | 49 run: |
50 npm uninstall node-gyp 50 npm uninstall node-gyp
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index de93bb9fb..c0ac073d0 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -121,10 +121,10 @@ jobs:
121 with: 121 with:
122 key: ${{ runner.os }}-${{ env.cache-name }} 122 key: ${{ runner.os }}-${{ env.cache-name }}
123 path: ${{ env.ELECTRON_BUILDER_CACHE }} 123 path: ${{ env.ELECTRON_BUILDER_CACHE }}
124 - name: Use Node.js 14.16.1 124 - name: Use Node.js 14.17.3
125 uses: actions/setup-node@v2 125 uses: actions/setup-node@v2
126 with: 126 with:
127 node-version: 14.16.1 127 node-version: 14.17.3
128 - name: Upgrade Xcode version on the macOS 10.15 default runners provided by GH Actions 128 - name: Upgrade Xcode version on the macOS 10.15 default runners provided by GH Actions
129 run: | 129 run: |
130 sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* 130 sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
@@ -219,10 +219,10 @@ jobs:
219 with: 219 with:
220 key: ${{ runner.os }}-${{ env.cache-name }} 220 key: ${{ runner.os }}-${{ env.cache-name }}
221 path: ${{ env.ELECTRON_BUILDER_CACHE }} 221 path: ${{ env.ELECTRON_BUILDER_CACHE }}
222 - name: Use Node.js 14.16.1 222 - name: Use Node.js 14.17.3
223 uses: actions/setup-node@v2 223 uses: actions/setup-node@v2
224 with: 224 with:
225 node-version: 14.16.1 225 node-version: 14.17.3
226 - name: Uninstall locally and reinstall node-gyp globally 226 - name: Uninstall locally and reinstall node-gyp globally
227 run: | 227 run: |
228 npm uninstall node-gyp 228 npm uninstall node-gyp
@@ -309,10 +309,10 @@ jobs:
309 with: 309 with:
310 key: ${{ runner.os }}-${{ env.cache-name }} 310 key: ${{ runner.os }}-${{ env.cache-name }}
311 path: ${{ env.ELECTRON_BUILDER_CACHE }} 311 path: ${{ env.ELECTRON_BUILDER_CACHE }}
312 - name: Use Node.js 14.16.1 312 - name: Use Node.js 14.17.3
313 uses: actions/setup-node@v2 313 uses: actions/setup-node@v2
314 with: 314 with:
315 node-version: 14.16.1 315 node-version: 14.17.3
316 - name: Install node dependencies recursively 316 - name: Install node dependencies recursively
317 run: npx lerna bootstrap 317 run: npx lerna bootstrap
318 - name: Package recipes 318 - name: Package recipes
diff --git a/.nvmrc b/.nvmrc
index 6b17d228d..c6244cda0 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
14.16.1 14.17.3
diff --git a/package.json b/package.json
index b35123315..bc60af039 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
11 "repository": "https://github.com/getferdi/ferdi.git", 11 "repository": "https://github.com/getferdi/ferdi.git",
12 "private": true, 12 "private": true,
13 "engines": { 13 "engines": {
14 "node": "^14.16", 14 "node": "^14.17",
15 "npm": "^6.14", 15 "npm": "^6.14",
16 "node-gyp": "^8.0" 16 "node-gyp": "^8.0"
17 }, 17 },