diff options
author | 2021-09-28 11:30:40 +0530 | |
---|---|---|
committer | 2021-09-28 11:30:40 +0530 | |
commit | 4d270eb6eb4b6dc659b7d0223ea4c5fc431279ce (patch) | |
tree | 87dc30bc4bace2b1de1d8aa4b3812f52d3119643 /src | |
parent | 5.6.3-nightly.16 [skip ci] (diff) | |
download | ferdium-app-4d270eb6eb4b6dc659b7d0223ea4c5fc431279ce.tar.gz ferdium-app-4d270eb6eb4b6dc659b7d0223ea4c5fc431279ce.tar.zst ferdium-app-4d270eb6eb4b6dc659b7d0223ea4c5fc431279ce.zip |
chore: merge the nightly builds into the main 'ferdi' project (#1996)
Diffstat (limited to 'src')
-rw-r--r-- | src/config.ts | 4 | ||||
-rw-r--r-- | src/electron/ipc-api/autoUpdate.ts | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/config.ts b/src/config.ts index 6ad58c7a5..667b0a962 100644 --- a/src/config.ts +++ b/src/config.ts | |||
@@ -158,10 +158,6 @@ export const FRANZ_SERVICE_REQUEST = `${GITHUB_FERDI_URL}/recipes/issues`; | |||
158 | export const FRANZ_TRANSLATION = 'https://crowdin.com/project/getferdi'; | 158 | export const FRANZ_TRANSLATION = 'https://crowdin.com/project/getferdi'; |
159 | export const FRANZ_DEV_DOCS = 'http://bit.ly/franz-dev-hub'; | 159 | export const FRANZ_DEV_DOCS = 'http://bit.ly/franz-dev-hub'; |
160 | 160 | ||
161 | export const GITHUB_ORG_NAME = 'getferdi'; | ||
162 | export const GITHUB_FERDI_REPO_NAME = 'ferdi'; | ||
163 | export const GITHUB_NIGHTLIES_REPO_NAME = 'nightlies'; | ||
164 | |||
165 | export const FILE_SYSTEM_SETTINGS_TYPES = ['app', 'proxy']; | 161 | export const FILE_SYSTEM_SETTINGS_TYPES = ['app', 'proxy']; |
166 | 162 | ||
167 | export const LOCAL_SERVER = 'You are using Ferdi without a server'; | 163 | export const LOCAL_SERVER = 'You are using Ferdi without a server'; |
diff --git a/src/electron/ipc-api/autoUpdate.ts b/src/electron/ipc-api/autoUpdate.ts index 31c614ab7..e6b805edc 100644 --- a/src/electron/ipc-api/autoUpdate.ts +++ b/src/electron/ipc-api/autoUpdate.ts | |||
@@ -1,6 +1,5 @@ | |||
1 | import { app, ipcMain, BrowserWindow } from 'electron'; | 1 | import { app, ipcMain, BrowserWindow } from 'electron'; |
2 | import { autoUpdater } from 'electron-updater'; | 2 | import { autoUpdater } from 'electron-updater'; |
3 | import { GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config'; | ||
4 | import { isMac, isWindows } from '../../environment'; | 3 | import { isMac, isWindows } from '../../environment'; |
5 | 4 | ||
6 | const debug = require('debug')('Ferdi:ipcApi:autoUpdate'); | 5 | const debug = require('debug')('Ferdi:ipcApi:autoUpdate'); |
@@ -26,11 +25,6 @@ export default (params: { mainWindow: BrowserWindow; settings: any }) => { | |||
26 | params.settings.app.get('nightly'), | 25 | params.settings.app.get('nightly'), |
27 | ); | 26 | ); |
28 | autoUpdater.channel = 'alpha'; | 27 | autoUpdater.channel = 'alpha'; |
29 | autoUpdater.setFeedURL({ | ||
30 | provider: 'github', | ||
31 | owner: GITHUB_ORG_NAME, | ||
32 | repo: GITHUB_NIGHTLIES_REPO_NAME, | ||
33 | }); | ||
34 | } | 28 | } |
35 | 29 | ||
36 | if (args.action === 'check') { | 30 | if (args.action === 'check') { |