diff options
author | 2021-12-21 21:33:21 +0100 | |
---|---|---|
committer | 2021-12-21 21:33:21 +0100 | |
commit | caf2d70143aabe64b64e2b08c2e3e2cca7ee7225 (patch) | |
tree | 46c8e9648c30409734981b7ccbf823a2805255c8 | |
parent | 5.6.5-nightly.5 [skip ci] (diff) | |
parent | Merge branch 'hotfix/windows-build' into release (diff) | |
download | ferdium-app-caf2d70143aabe64b64e2b08c2e3e2cca7ee7225.tar.gz ferdium-app-caf2d70143aabe64b64e2b08c2e3e2cca7ee7225.tar.zst ferdium-app-caf2d70143aabe64b64e2b08c2e3e2cca7ee7225.zip |
Merge branch 'release' into develop
-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 | 26 | ||||
-rw-r--r-- | package.json | 8 |
7 files changed, 37 insertions, 37 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index fc8636f6f..3f356e1e0 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 specified in the '.nvmrc' file | 50 | - name: Use Node.js 16.13.0 |
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-file: '.nvmrc' | 54 | node-version: 16.13.0 |
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 specified in the '.nvmrc' file | 137 | - name: Use Node.js 16.13.0 |
138 | uses: actions/setup-node@v2 | 138 | uses: actions/setup-node@v2 |
139 | with: | 139 | with: |
140 | node-version-file: '.nvmrc' | 140 | node-version: 16.13.0 |
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.24.1 | 144 | version: 6.23.6 |
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 specified in the '.nvmrc' file | 219 | - name: Use Node.js 16.13.0 |
220 | uses: actions/setup-node@v2 | 220 | uses: actions/setup-node@v2 |
221 | with: | 221 | with: |
222 | node-version-file: '.nvmrc' | 222 | node-version: 16.13.0 |
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.24.1 | 226 | version: 6.23.6 |
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 |
@@ -319,14 +319,14 @@ jobs: | |||
319 | with: | 319 | with: |
320 | key: ${{ runner.os }}-${{ env.cache-name }} | 320 | key: ${{ runner.os }}-${{ env.cache-name }} |
321 | path: ${{ env.ELECTRON_BUILDER_CACHE }} | 321 | path: ${{ env.ELECTRON_BUILDER_CACHE }} |
322 | - name: Use Node.js specified in the '.nvmrc' file | 322 | - name: Use Node.js 16.13.0 |
323 | uses: actions/setup-node@v2 | 323 | uses: actions/setup-node@v2 |
324 | with: | 324 | with: |
325 | node-version-file: '.nvmrc' | 325 | node-version: 16.13.0 |
326 | - name: Install pnpm | 326 | - name: Install pnpm |
327 | uses: pnpm/action-setup@v2.0.1 | 327 | uses: pnpm/action-setup@v2.0.1 |
328 | with: | 328 | with: |
329 | version: 6.24.1 | 329 | version: 6.23.6 |
330 | - name: Install node dependencies | 330 | - name: Install node dependencies |
331 | run: npm i | 331 | run: npm i |
332 | shell: bash | 332 | shell: bash |
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index eb69b049b..7958aa5f5 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 specified in the '.nvmrc' file | 34 | - name: Use Node.js 16.13.0 |
35 | uses: actions/setup-node@v2 | 35 | uses: actions/setup-node@v2 |
36 | with: | 36 | with: |
37 | node-version-file: '.nvmrc' | 37 | node-version: 16.13.0 |
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.24.1 | 41 | version: 6.23.6 |
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.1 | 16.13.0 | ||
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a379f80dd..55c5303d7 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.1 | 63 | v16.13.0 |
64 | npm -v | 64 | npm -v |
65 | 8.1.2 | 65 | 8.1.1 |
66 | pnpm -v | 66 | pnpm -v |
67 | 6.24.1 | 67 | 6.23.6 |
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 372a2c8cb..3e02fe64c 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.1-buster as builder | 3 | FROM docker.io/library/node:16.13.0-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 npm@8.1.2 pnpm@6.24.1 | 19 | RUN npm i -g pnpm@6.23.6 |
20 | 20 | ||
21 | COPY package*.json ./ | 21 | COPY package*.json ./ |
22 | 22 | ||
diff --git a/package-lock.json b/package-lock.json index fe4f52345..e1cc9af49 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -1,12 +1,12 @@ | |||
1 | { | 1 | { |
2 | "name": "ferdi", | 2 | "name": "ferdi", |
3 | "version": "5.6.5-nightly.5", | 3 | "version": "5.6.5", |
4 | "lockfileVersion": 2, | 4 | "lockfileVersion": 2, |
5 | "requires": true, | 5 | "requires": true, |
6 | "packages": { | 6 | "packages": { |
7 | "": { | 7 | "": { |
8 | "name": "ferdi", | 8 | "name": "ferdi", |
9 | "version": "5.6.5-nightly.5", | 9 | "version": "5.6.5", |
10 | "license": "Apache-2.0", | 10 | "license": "Apache-2.0", |
11 | "dependencies": { | 11 | "dependencies": { |
12 | "@adonisjs/ace": "^5.0.8", | 12 | "@adonisjs/ace": "^5.0.8", |
@@ -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.1", | 152 | "node-gyp": "8.4.0", |
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.1", | 168 | "node": "^16.13.0", |
169 | "npm": "^8.1.2" | 169 | "npm": "^8.1.0" |
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" |
@@ -21350,9 +21350,9 @@ | |||
21350 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" | 21350 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" |
21351 | }, | 21351 | }, |
21352 | "node_modules/node-gyp": { | 21352 | "node_modules/node-gyp": { |
21353 | "version": "8.4.1", | 21353 | "version": "8.4.0", |
21354 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", | 21354 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.0.tgz", |
21355 | "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", | 21355 | "integrity": "sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q==", |
21356 | "dev": true, | 21356 | "dev": true, |
21357 | "dependencies": { | 21357 | "dependencies": { |
21358 | "env-paths": "^2.2.0", | 21358 | "env-paths": "^2.2.0", |
@@ -21360,7 +21360,7 @@ | |||
21360 | "graceful-fs": "^4.2.6", | 21360 | "graceful-fs": "^4.2.6", |
21361 | "make-fetch-happen": "^9.1.0", | 21361 | "make-fetch-happen": "^9.1.0", |
21362 | "nopt": "^5.0.0", | 21362 | "nopt": "^5.0.0", |
21363 | "npmlog": "^6.0.0", | 21363 | "npmlog": "^4.1.2", |
21364 | "rimraf": "^3.0.2", | 21364 | "rimraf": "^3.0.2", |
21365 | "semver": "^7.3.5", | 21365 | "semver": "^7.3.5", |
21366 | "tar": "^6.1.2", | 21366 | "tar": "^6.1.2", |
@@ -48036,9 +48036,9 @@ | |||
48036 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" | 48036 | "integrity": "sha1-5FSb63kcOxyEJ1WlJztzvosICjQ=" |
48037 | }, | 48037 | }, |
48038 | "node-gyp": { | 48038 | "node-gyp": { |
48039 | "version": "8.4.1", | 48039 | "version": "8.4.0", |
48040 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", | 48040 | "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.0.tgz", |
48041 | "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", | 48041 | "integrity": "sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q==", |
48042 | "dev": true, | 48042 | "dev": true, |
48043 | "requires": { | 48043 | "requires": { |
48044 | "env-paths": "^2.2.0", | 48044 | "env-paths": "^2.2.0", |
@@ -48046,7 +48046,7 @@ | |||
48046 | "graceful-fs": "^4.2.6", | 48046 | "graceful-fs": "^4.2.6", |
48047 | "make-fetch-happen": "^9.1.0", | 48047 | "make-fetch-happen": "^9.1.0", |
48048 | "nopt": "^5.0.0", | 48048 | "nopt": "^5.0.0", |
48049 | "npmlog": "^6.0.0", | 48049 | "npmlog": "^4.1.2", |
48050 | "rimraf": "^3.0.2", | 48050 | "rimraf": "^3.0.2", |
48051 | "semver": "^7.3.5", | 48051 | "semver": "^7.3.5", |
48052 | "tar": "^6.1.2", | 48052 | "tar": "^6.1.2", |
diff --git a/package.json b/package.json index 42bfea49c..356fe6098 100644 --- a/package.json +++ b/package.json | |||
@@ -3,7 +3,7 @@ | |||
3 | "productName": "Ferdi", | 3 | "productName": "Ferdi", |
4 | "desktopName": "ferdi.desktop", | 4 | "desktopName": "ferdi.desktop", |
5 | "appId": "com.kytwb.ferdi", | 5 | "appId": "com.kytwb.ferdi", |
6 | "version": "5.6.5-nightly.5", | 6 | "version": "5.6.5", |
7 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", | 7 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", |
8 | "copyright": "kytwb", | 8 | "copyright": "kytwb", |
9 | "main": "index.js", | 9 | "main": "index.js", |
@@ -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.1", | 14 | "node": "^16.13.0", |
15 | "npm": "^8.1.2" | 15 | "npm": "^8.1.0" |
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.1", | 188 | "node-gyp": "8.4.0", |
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", |