diff options
-rw-r--r-- | .github/workflows/builds.yml | 22 | ||||
-rw-r--r-- | .github/workflows/dependency-updates.yml | 6 | ||||
-rw-r--r-- | .nvmrc | 2 | ||||
-rw-r--r-- | CONTRIBUTING.md | 6 | ||||
-rw-r--r-- | Dockerfile | 4 | ||||
-rw-r--r-- | package-lock.json | 22 | ||||
-rw-r--r-- | package.json | 6 |
7 files changed, 34 insertions, 34 deletions
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: | |||
47 | submodules: recursive | 47 | submodules: recursive |
48 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | 48 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging |
49 | # ssh-key: ${{ secrets.FERDI_PUBLISH_TOKEN }} | 49 | # ssh-key: ${{ secrets.FERDI_PUBLISH_TOKEN }} |
50 | - name: Use Node.js 16.13.0 | 50 | - name: Use Node.js specified in the '.nvmrc' file |
51 | uses: actions/setup-node@v2 | 51 | uses: actions/setup-node@v2 |
52 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} | 52 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} |
53 | with: | 53 | with: |
54 | node-version: 16.13.0 | 54 | node-version-file: '.nvmrc' |
55 | - id: should_run | 55 | - id: should_run |
56 | name: Check whether there are any commits since this run was last triggered and push them and/or set the output | 56 | name: Check whether there are any commits since this run was last triggered and push them and/or set the output |
57 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} | 57 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} |
@@ -134,14 +134,14 @@ jobs: | |||
134 | with: | 134 | with: |
135 | key: ${{ runner.os }}-${{ env.cache-name }} | 135 | key: ${{ runner.os }}-${{ env.cache-name }} |
136 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 136 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
137 | - name: Use Node.js 16.13.0 | 137 | - name: Use Node.js specified in the '.nvmrc' file |
138 | uses: actions/setup-node@v2 | 138 | uses: actions/setup-node@v2 |
139 | with: | 139 | with: |
140 | node-version: 16.13.0 | 140 | node-version-file: '.nvmrc' |
141 | - name: Install pnpm | 141 | - name: Install pnpm |
142 | uses: pnpm/action-setup@v2.0.1 | 142 | uses: pnpm/action-setup@v2.0.1 |
143 | with: | 143 | with: |
144 | version: 6.23.6 | 144 | version: 6.24.1 |
145 | - name: Install node dependencies | 145 | - name: Install node dependencies |
146 | run: npm i | 146 | run: npm i |
147 | - name: Package recipes | 147 | - name: Package recipes |
@@ -216,14 +216,14 @@ jobs: | |||
216 | with: | 216 | with: |
217 | key: ${{ runner.os }}-${{ env.cache-name }} | 217 | key: ${{ runner.os }}-${{ env.cache-name }} |
218 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 218 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
219 | - name: Use Node.js 16.13.0 | 219 | - name: Use Node.js specified in the '.nvmrc' file |
220 | uses: actions/setup-node@v2 | 220 | uses: actions/setup-node@v2 |
221 | with: | 221 | with: |
222 | node-version: 16.13.0 | 222 | node-version-file: '.nvmrc' |
223 | - name: Install pnpm | 223 | - name: Install pnpm |
224 | uses: pnpm/action-setup@v2.0.1 | 224 | uses: pnpm/action-setup@v2.0.1 |
225 | with: | 225 | with: |
226 | version: 6.23.6 | 226 | version: 6.24.1 |
227 | - name: Install node dependencies | 227 | - name: Install node dependencies |
228 | run: npm i | 228 | run: npm i |
229 | - name: Figure out used package.json version | 229 | - name: Figure out used package.json version |
@@ -301,14 +301,14 @@ jobs: | |||
301 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) | 301 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) |
302 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 302 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |
303 | shell: bash | 303 | shell: bash |
304 | - name: Use Node.js 16.13.0 | 304 | - name: Use Node.js specified in the '.nvmrc' file |
305 | uses: actions/setup-node@v2 | 305 | uses: actions/setup-node@v2 |
306 | with: | 306 | with: |
307 | node-version: 16.13.0 | 307 | node-version-file: '.nvmrc' |
308 | - name: Install pnpm | 308 | - name: Install pnpm |
309 | uses: pnpm/action-setup@v2.0.1 | 309 | uses: pnpm/action-setup@v2.0.1 |
310 | with: | 310 | with: |
311 | version: 6.23.6 | 311 | version: 6.24.1 |
312 | - name: Install node dependencies | 312 | - name: Install node dependencies |
313 | uses: nick-invision/retry@v2.4.0 | 313 | uses: nick-invision/retry@v2.4.0 |
314 | with: | 314 | 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: | |||
31 | run: | | 31 | run: | |
32 | echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 32 | echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |
33 | shell: bash | 33 | shell: bash |
34 | - name: Use Node.js 16.13.0 | 34 | - name: Use Node.js specified in the '.nvmrc' file |
35 | uses: actions/setup-node@v2 | 35 | uses: actions/setup-node@v2 |
36 | with: | 36 | with: |
37 | node-version: 16.13.0 | 37 | node-version-file: '.nvmrc' |
38 | - name: Install pnpm | 38 | - name: Install pnpm |
39 | uses: pnpm/action-setup@v2.0.1 | 39 | uses: pnpm/action-setup@v2.0.1 |
40 | with: | 40 | with: |
41 | version: 6.23.6 | 41 | version: 6.24.1 |
42 | - name: Install node dependencies | 42 | - name: Install node dependencies |
43 | run: npm i | 43 | run: npm i |
44 | - name: Update submodules | 44 | - name: Update submodules |
@@ -1 +1 @@ | |||
16.13.0 | 16.13.1 | ||
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 55c5303d7..a379f80dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md | |||
@@ -60,11 +60,11 @@ 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 | v16.13.0 | 63 | v16.13.1 |
64 | npm -v | 64 | npm -v |
65 | 8.1.1 | 65 | 8.1.2 |
66 | pnpm -v | 66 | pnpm -v |
67 | 6.23.6 | 67 | 6.24.1 |
68 | ``` | 68 | ``` |
69 | 69 | ||
70 | _Note:_ You can choose any package manager to manage multiple versions of `node` and `npm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf). | 70 | _Note:_ You can choose any package manager to manage multiple versions of `node` and `npm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf). |
diff --git a/Dockerfile b/Dockerfile index 3e02fe64c..372a2c8cb 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 docker.io/library/node:16.13.0-buster as builder | 3 | FROM docker.io/library/node:16.13.1-buster as builder |
4 | 4 | ||
5 | ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share" | 5 | ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share" |
6 | 6 | ||
@@ -16,7 +16,7 @@ RUN apt-get update -y \ | |||
16 | 16 | ||
17 | WORKDIR /usr/src/ferdi | 17 | WORKDIR /usr/src/ferdi |
18 | 18 | ||
19 | RUN npm i -g pnpm@6.23.6 | 19 | RUN npm i -g npm@8.1.2 pnpm@6.24.1 |
20 | 20 | ||
21 | COPY package*.json ./ | 21 | COPY package*.json ./ |
22 | 22 | ||
diff --git a/package-lock.json b/package-lock.json index 7e2993bd8..d5b5c0010 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -149,7 +149,7 @@ | |||
149 | "jest": "^27.3.1", | 149 | "jest": "^27.3.1", |
150 | "kebab-case": "^1.0.1", | 150 | "kebab-case": "^1.0.1", |
151 | "mocha": "^9.1.3", | 151 | "mocha": "^9.1.3", |
152 | "node-gyp": "8.4.0", | 152 | "node-gyp": "8.4.1", |
153 | "prettier": "^2.4.1", | 153 | "prettier": "^2.4.1", |
154 | "preval-build-info": "^1.0.3", | 154 | "preval-build-info": "^1.0.3", |
155 | "rimraf": "^3.0.2", | 155 | "rimraf": "^3.0.2", |
@@ -165,8 +165,8 @@ | |||
165 | "webpack-dev-server": "^3.11.2" | 165 | "webpack-dev-server": "^3.11.2" |
166 | }, | 166 | }, |
167 | "engines": { | 167 | "engines": { |
168 | "node": "^16.13.0", | 168 | "node": "^16.13.1", |
169 | "npm": "^8.1.0" | 169 | "npm": "^8.1.2" |
170 | }, | 170 | }, |
171 | "optionalDependencies": { | 171 | "optionalDependencies": { |
172 | "node-mac-permissions": "git@github.com:vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb" | 172 | "node-mac-permissions": "git@github.com:vraravam/node-mac-permissions.git#3cffec37379e6584627d831611a8ff12b57bbcdb" |
@@ -21357,9 +21357,9 @@ | |||
21357 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" | 21357 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" |
21358 | }, | 21358 | }, |
21359 | "node_modules/node-gyp": { | 21359 | "node_modules/node-gyp": { |
21360 | "version": "8.4.0", | 21360 | "version": "8.4.1", |
21361 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.0.tgz", | 21361 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", |
21362 | "integrity": "sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q==", | 21362 | "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", |
21363 | "dev": true, | 21363 | "dev": true, |
21364 | "dependencies": { | 21364 | "dependencies": { |
21365 | "env-paths": "^2.2.0", | 21365 | "env-paths": "^2.2.0", |
@@ -21367,7 +21367,7 @@ | |||
21367 | "graceful-fs": "^4.2.6", | 21367 | "graceful-fs": "^4.2.6", |
21368 | "make-fetch-happen": "^9.1.0", | 21368 | "make-fetch-happen": "^9.1.0", |
21369 | "nopt": "^5.0.0", | 21369 | "nopt": "^5.0.0", |
21370 | "npmlog": "^4.1.2", | 21370 | "npmlog": "^6.0.0", |
21371 | "rimraf": "^3.0.2", | 21371 | "rimraf": "^3.0.2", |
21372 | "semver": "^7.3.5", | 21372 | "semver": "^7.3.5", |
21373 | "tar": "^6.1.2", | 21373 | "tar": "^6.1.2", |
@@ -47772,9 +47772,9 @@ | |||
47772 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" | 47772 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" |
47773 | }, | 47773 | }, |
47774 | "node-gyp": { | 47774 | "node-gyp": { |
47775 | "version": "8.4.0", | 47775 | "version": "8.4.1", |
47776 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.0.tgz", | 47776 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", |
47777 | "integrity": "sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q==", | 47777 | "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", |
47778 | "dev": true, | 47778 | "dev": true, |
47779 | "requires": { | 47779 | "requires": { |
47780 | "env-paths": "^2.2.0", | 47780 | "env-paths": "^2.2.0", |
@@ -47782,7 +47782,7 @@ | |||
47782 | "graceful-fs": "^4.2.6", | 47782 | "graceful-fs": "^4.2.6", |
47783 | "make-fetch-happen": "^9.1.0", | 47783 | "make-fetch-happen": "^9.1.0", |
47784 | "nopt": "^5.0.0", | 47784 | "nopt": "^5.0.0", |
47785 | "npmlog": "^4.1.2", | 47785 | "npmlog": "^6.0.0", |
47786 | "rimraf": "^3.0.2", | 47786 | "rimraf": "^3.0.2", |
47787 | "semver": "^7.3.5", | 47787 | "semver": "^7.3.5", |
47788 | "tar": "^6.1.2", | 47788 | "tar": "^6.1.2", |
diff --git a/package.json b/package.json index 755ca5238..42bcdda41 100644 --- a/package.json +++ b/package.json | |||
@@ -11,8 +11,8 @@ | |||
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": "^16.13.0", | 14 | "node": "^16.13.1", |
15 | "npm": "^8.1.0" | 15 | "npm": "^8.1.2" |
16 | }, | 16 | }, |
17 | "engine-strict": true, | 17 | "engine-strict": true, |
18 | "scripts": { | 18 | "scripts": { |
@@ -185,7 +185,7 @@ | |||
185 | "jest": "^27.3.1", | 185 | "jest": "^27.3.1", |
186 | "kebab-case": "^1.0.1", | 186 | "kebab-case": "^1.0.1", |
187 | "mocha": "^9.1.3", | 187 | "mocha": "^9.1.3", |
188 | "node-gyp": "8.4.0", | 188 | "node-gyp": "8.4.1", |
189 | "prettier": "^2.4.1", | 189 | "prettier": "^2.4.1", |
190 | "preval-build-info": "^1.0.3", | 190 | "preval-build-info": "^1.0.3", |
191 | "rimraf": "^3.0.2", | 191 | "rimraf": "^3.0.2", |