diff options
-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 | 10 | ||||
-rw-r--r-- | CONTRIBUTING.md | 2 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
m--------- | recipes | 0 |
7 files changed, 21 insertions, 11 deletions
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index a9406df23..dafcfa4d1 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.3 | 43 | - name: Use Node.js 14.17.5 |
44 | uses: actions/setup-node@v2 | 44 | uses: actions/setup-node@v2 |
45 | with: | 45 | with: |
46 | node-version: 14.17.3 | 46 | node-version: 14.17.5 |
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 7a701758e..ec40d267c 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.3 | 133 | - name: Use Node.js 14.17.5 |
134 | uses: actions/setup-node@v2 | 134 | uses: actions/setup-node@v2 |
135 | with: | 135 | with: |
136 | node-version: 14.17.3 | 136 | node-version: 14.17.5 |
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.3 | 231 | - name: Use Node.js 14.17.5 |
232 | uses: actions/setup-node@v2 | 232 | uses: actions/setup-node@v2 |
233 | with: | 233 | with: |
234 | node-version: 14.17.3 | 234 | node-version: 14.17.5 |
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.3 | 346 | - name: Use Node.js 14.17.5 |
347 | uses: actions/setup-node@v2 | 347 | uses: actions/setup-node@v2 |
348 | with: | 348 | with: |
349 | node-version: 14.17.3 | 349 | node-version: 14.17.5 |
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.3 | 14.17.5 | ||
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7840cc6f6..76760ca0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -1,3 +1,13 @@ | |||
1 | # [v5.6.1-nightly.41](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.40...v5.6.1-nightly.41) (2021-08-28) | ||
2 | |||
3 | ### Internal | ||
4 | |||
5 | - Upgraded 'nodejs' to '14.17.5' 💖 @vraravam | ||
6 | - Remove Franz brand 💖 @vantezzen | ||
7 | - Switch from `misty` to `concurrently` (#1846) 💖 @vantezzen | ||
8 | - Services: Normalized all service recipes to be es6 compliant 💖 @vraravam | ||
9 | - Services: Change entry point in the 'facebookpages' service (getferdi/recipes#640) 💖 @oda-alexandre, @vraravam | ||
10 | |||
1 | # [v5.6.1-nightly.40](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.38...v5.6.1-nightly.40) (2021-08-27) | 11 | # [v5.6.1-nightly.40](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.38...v5.6.1-nightly.40) (2021-08-27) |
2 | 12 | ||
3 | ### Bug Fixes | 13 | ### Bug Fixes |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a0264ea98..b79432d43 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.3 | 63 | v14.17.5 |
64 | npm -v | 64 | npm -v |
65 | 6.14.13 | 65 | 6.14.13 |
66 | ``` | 66 | ``` |
diff --git a/Dockerfile b/Dockerfile index 7fd79fb3a..e69babe2b 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.3-buster as builder | 3 | FROM node:14.17.5-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 fe613088a813394760ca27afeee554cfa7290d6 | Subproject 79b0da05aefae85bdea794fbe70e5d19fe609ac | ||