diff options
author | Bennett <hello@vantezzen.io> | 2020-12-20 13:16:27 +0100 |
---|---|---|
committer | Bennett <hello@vantezzen.io> | 2020-12-20 13:16:27 +0100 |
commit | 1442b820bada2f1eb37b52fabd2241236595702a (patch) | |
tree | dd42303b1e9217f73a9773a72e716cbe3fc0a9d6 | |
parent | Update CONTRIBUTING.md (#1079) (diff) | |
parent | Remove notarization (diff) | |
download | ferdium-app-1442b820bada2f1eb37b52fabd2241236595702a.tar.gz ferdium-app-1442b820bada2f1eb37b52fabd2241236595702a.tar.zst ferdium-app-1442b820bada2f1eb37b52fabd2241236595702a.zip |
Merge branch 'release' into developv5.6.0-beta.5
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | appveyor.yml | 6 | ||||
-rw-r--r-- | electron-builder.yml | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
m--------- | recipes | 0 |
5 files changed, 8 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 56fc094e4..d5f1dd0c0 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -53,7 +53,7 @@ script: | |||
53 | - | | 53 | - | |
54 | if [ $TRAVIS_BRANCH == "release" ]; then | 54 | if [ $TRAVIS_BRANCH == "release" ]; then |
55 | echo "Building..." | 55 | echo "Building..." |
56 | travis_retry travis_wait 100 npm run build | 56 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=ferdi -c.mac.identity=null |
57 | fi | 57 | fi |
58 | - | | 58 | - | |
59 | if [ $TRAVIS_BRANCH == "nightly" ]; then | 59 | if [ $TRAVIS_BRANCH == "nightly" ]; then |
diff --git a/appveyor.yml b/appveyor.yml index b09759a42..2f5299dd9 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
@@ -31,3 +31,9 @@ for: | |||
31 | message: /trigger AppVeyor nightly build/ | 31 | message: /trigger AppVeyor nightly build/ |
32 | build_script: | 32 | build_script: |
33 | - appveyor-retry npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies | 33 | - appveyor-retry npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies |
34 | - | ||
35 | branches: | ||
36 | only: | ||
37 | - release | ||
38 | build_script: | ||
39 | - appveyor-retry npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=ferdi | ||
diff --git a/electron-builder.yml b/electron-builder.yml index 86349ba6b..f43e33950 100644 --- a/electron-builder.yml +++ b/electron-builder.yml | |||
@@ -18,8 +18,6 @@ mac: | |||
18 | NSMicrophoneUsageDescription: "This app requires camera access for video messaging services." | 18 | NSMicrophoneUsageDescription: "This app requires camera access for video messaging services." |
19 | NSCameraUsageDescription: "This app requires microphone access for audio messaging services." | 19 | NSCameraUsageDescription: "This app requires microphone access for audio messaging services." |
20 | 20 | ||
21 | afterSign: ./build-helpers/notarize.js | ||
22 | |||
23 | dmg: | 21 | dmg: |
24 | background: ./build-helpers/images/dmgInstaller.tiff | 22 | background: ./build-helpers/images/dmgInstaller.tiff |
25 | icon: ./build-helpers/images/icon.icns | 23 | icon: ./build-helpers/images/icon.icns |
diff --git a/package.json b/package.json index 93e68bbbc..9705475be 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.0-nightly.1", | 6 | "version": "5.6.0-beta.4", |
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", |
diff --git a/recipes b/recipes | |||
Subproject 5c2f5bdb4edca04d8466c94091c232655ba089f | Subproject c40fae916884a1754cec8d3ec28b5cdfc7e5370 | ||