diff options
author | Vijay A <avijayr@protonmail.com> | 2021-09-02 09:58:42 +0530 |
---|---|---|
committer | Vijay A <avijayr@protonmail.com> | 2021-09-02 09:58:42 +0530 |
commit | 62f48a62a27231ab930ab75e0c5bb3566492081c (patch) | |
tree | 383bbf30b2dbaa15e50825d8305d35c4ddf6cee3 | |
parent | chore: update npm modules. (diff) | |
download | ferdium-app-62f48a62a27231ab930ab75e0c5bb3566492081c.tar.gz ferdium-app-62f48a62a27231ab930ab75e0c5bb3566492081c.tar.zst ferdium-app-62f48a62a27231ab930ab75e0c5bb3566492081c.zip |
chore: upgrade 'nodejs' to '14.17.6'
-rw-r--r-- | .github/workflows/dependency-updates.yml | 4 | ||||
-rw-r--r-- | .github/workflows/ferdi-builds.yml | 12 | ||||
-rw-r--r-- | .nvmrc | 2 | ||||
-rw-r--r-- | CHANGELOG.md | 14 | ||||
-rw-r--r-- | CONTRIBUTING.md | 2 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
m--------- | recipes | 0 |
7 files changed, 21 insertions, 15 deletions
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index dafcfa4d1..5d7d64efc 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml | |||
@@ -40,10 +40,10 @@ jobs: | |||
40 | restore-keys: | | 40 | restore-keys: | |
41 | ${{ runner.os }}-14.17-build-${{ env.cache-name }}- | 41 | ${{ runner.os }}-14.17-build-${{ env.cache-name }}- |
42 | ${{ runner.os }}-14.17-build- | 42 | ${{ runner.os }}-14.17-build- |
43 | - name: Use Node.js 14.17.5 | 43 | - name: Use Node.js 14.17.6 |
44 | uses: actions/setup-node@v2 | 44 | uses: actions/setup-node@v2 |
45 | with: | 45 | with: |
46 | node-version: 14.17.5 | 46 | node-version: 14.17.6 |
47 | - name: Uninstall locally and reinstall global npm modules | 47 | - name: Uninstall locally and reinstall global npm modules |
48 | run: | | 48 | run: | |
49 | npm uninstall node-gyp | 49 | npm uninstall node-gyp |
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml index ec40d267c..c17011d69 100644 --- a/.github/workflows/ferdi-builds.yml +++ b/.github/workflows/ferdi-builds.yml | |||
@@ -130,10 +130,10 @@ jobs: | |||
130 | with: | 130 | with: |
131 | key: ${{ runner.os }}-${{ env.cache-name }} | 131 | key: ${{ runner.os }}-${{ env.cache-name }} |
132 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 132 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
133 | - name: Use Node.js 14.17.5 | 133 | - name: Use Node.js 14.17.6 |
134 | uses: actions/setup-node@v2 | 134 | uses: actions/setup-node@v2 |
135 | with: | 135 | with: |
136 | node-version: 14.17.5 | 136 | node-version: 14.17.6 |
137 | - name: Upgrade Xcode version on the macOS 10.15 default runners provided by GH Actions | 137 | - name: Upgrade Xcode version on the macOS 10.15 default runners provided by GH Actions |
138 | run: | | 138 | run: | |
139 | sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* | 139 | sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* |
@@ -228,10 +228,10 @@ jobs: | |||
228 | with: | 228 | with: |
229 | key: ${{ runner.os }}-${{ env.cache-name }} | 229 | key: ${{ runner.os }}-${{ env.cache-name }} |
230 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 230 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
231 | - name: Use Node.js 14.17.5 | 231 | - name: Use Node.js 14.17.6 |
232 | uses: actions/setup-node@v2 | 232 | uses: actions/setup-node@v2 |
233 | with: | 233 | with: |
234 | node-version: 14.17.5 | 234 | node-version: 14.17.6 |
235 | - name: Uninstall locally and reinstall global npm modules | 235 | - name: Uninstall locally and reinstall global npm modules |
236 | run: | | 236 | run: | |
237 | npm uninstall node-gyp | 237 | npm uninstall node-gyp |
@@ -343,10 +343,10 @@ jobs: | |||
343 | with: | 343 | with: |
344 | key: ${{ runner.os }}-${{ env.cache-name }} | 344 | key: ${{ runner.os }}-${{ env.cache-name }} |
345 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 345 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
346 | - name: Use Node.js 14.17.5 | 346 | - name: Use Node.js 14.17.6 |
347 | uses: actions/setup-node@v2 | 347 | uses: actions/setup-node@v2 |
348 | with: | 348 | with: |
349 | node-version: 14.17.5 | 349 | node-version: 14.17.6 |
350 | - name: Uninstall locally and reinstall global npm modules | 350 | - name: Uninstall locally and reinstall global npm modules |
351 | run: | | 351 | run: | |
352 | npm uninstall node-gyp | 352 | npm uninstall node-gyp |
@@ -1 +1 @@ | |||
14.17.5 | 14.17.6 | ||
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dbc909f5..ba7f47a7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -1,3 +1,9 @@ | |||
1 | # [v5.6.1-nightly.48](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.46...v5.6.1-nightly.48) (2021-09-03) | ||
2 | |||
3 | ### Internal | ||
4 | |||
5 | - Upgraded `nodejs` to `14.17.6` 💖 @vraravam | ||
6 | |||
1 | # [v5.6.1-beta.3](https://github.com/getferdi/ferdi/compare/v5.6.1-beta.2...v5.6.1-beta.3) (2021-09-01) | 7 | # [v5.6.1-beta.3](https://github.com/getferdi/ferdi/compare/v5.6.1-beta.2...v5.6.1-beta.3) (2021-09-01) |
2 | 8 | ||
3 | Please note that this is the same code as the `v5.6.1-nightly.46` tag. | 9 | Please note that this is the same code as the `v5.6.1-nightly.46` tag. |
@@ -58,7 +64,7 @@ The cumulative changes since the previous beta release are: | |||
58 | 64 | ||
59 | ### Internal | 65 | ### Internal |
60 | 66 | ||
61 | - Upgraded 'nodejs' to '14.17.5' 💖 @vraravam | 67 | - Upgraded `nodejs` to `14.17.4` 💖 @vraravam |
62 | - Remove some leftover Franz branding 💖 @vantezzen | 68 | - Remove some leftover Franz branding 💖 @vantezzen |
63 | - Switch from `misty` to `concurrently` (#1846) 💖 @vantezzen | 69 | - Switch from `misty` to `concurrently` (#1846) 💖 @vantezzen |
64 | - Services: Normalized all service recipes to be es6 compliant 💖 @vraravam | 70 | - Services: Normalized all service recipes to be es6 compliant 💖 @vraravam |
@@ -433,15 +439,15 @@ The cumulative changes since the previous beta release are: | |||
433 | 439 | ||
434 | # [5.6.0-beta.8](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.7...v5.6.0-beta.8) (2021-07-16) | 440 | # [5.6.0-beta.8](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.7...v5.6.0-beta.8) (2021-07-16) |
435 | 441 | ||
436 | - Upgraded electron to '13.1.7' 💖 @vraravam | 442 | - Upgraded `electron` to `13.1.7` 💖 @vraravam |
437 | - Turned on other h/w architectures (arm64, armv7l) for linux builds. (#1633) 💖 @vraravam | 443 | - Turned on other h/w architectures (arm64, armv7l) for linux builds. (#1633) 💖 @vraravam |
438 | - chore: run security audit on node modules 💖 @mhatvan | 444 | - chore: run security audit on node modules 💖 @mhatvan |
439 | - Upgraded nodejs to '14.17.3' 💖 @vraravam | 445 | - Upgraded `nodejs` to `14.17.3` 💖 @vraravam |
440 | - Use 'useragent-generator' to generate the user-agent string 💖 @vraravam | 446 | - Use 'useragent-generator' to generate the user-agent string 💖 @vraravam |
441 | 447 | ||
442 | # [5.6.0-beta.7](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.6...v5.6.0-beta.7) (2021-07-07) | 448 | # [5.6.0-beta.7](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.6...v5.6.0-beta.7) (2021-07-07) |
443 | 449 | ||
444 | - Upgraded electron to '13.1.5'. 💖 @vraravam | 450 | - Upgraded `electron` to `13.1.5`. 💖 @vraravam |
445 | - Adjust link opening behavior 💖 @stnkl | 451 | - Adjust link opening behavior 💖 @stnkl |
446 | - Fix color adjustments in Settings screen 💖 @kris7t | 452 | - Fix color adjustments in Settings screen 💖 @kris7t |
447 | - Expose Chrome version to todos webview (fix #1211) (#1478) 💖 @kris7t | 453 | - Expose Chrome version to todos webview (fix #1211) (#1478) 💖 @kris7t |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b79432d43..cc3f9e73c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
@@ -60,7 +60,7 @@ Currently, these are the combinations of system dependencies that work for MacOS | |||
60 | 60 | ||
61 | ```bash | 61 | ```bash |
62 | node -v | 62 | node -v |
63 | v14.17.5 | 63 | v14.17.6 |
64 | npm -v | 64 | npm -v |
65 | 6.14.13 | 65 | 6.14.13 |
66 | ``` | 66 | ``` |
diff --git a/Dockerfile b/Dockerfile index e69babe2b..a7900dbee 100644 --- a/Dockerfile +++ b/Dockerfile | |||
@@ -1,6 +1,6 @@ | |||
1 | # Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture | 1 | # Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture |
2 | 2 | ||
3 | FROM node:14.17.5-buster as builder | 3 | FROM node:14.17.6-buster as builder |
4 | 4 | ||
5 | # TODO: Need to setup a non-root user for security purposes | 5 | # TODO: Need to setup a non-root user for security purposes |
6 | 6 | ||
diff --git a/recipes b/recipes | |||
Subproject 2486fbbd72f08b759a2781913f388e91149e79e | Subproject 04277339b04fead3782ed853c248700b596d2b8 | ||