From 8313fb48c5f2efd1cd6742056ac397af50ee326b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 19 Oct 2017 02:18:32 +0200 Subject: remove unused file --- src/electron/ipc-api/tray.js | 48 -------------------------------------------- 1 file changed, 48 deletions(-) delete mode 100644 src/electron/ipc-api/tray.js diff --git a/src/electron/ipc-api/tray.js b/src/electron/ipc-api/tray.js deleted file mode 100644 index 43364c0ed..000000000 --- a/src/electron/ipc-api/tray.js +++ /dev/null @@ -1,48 +0,0 @@ -import { Tray, Menu, ipcMain } from 'electron'; -import path from 'path'; - -const INDICATOR_PLAIN = 'franz-taskbar'; -const INDICATOR_UNREAD = 'franz-taskbar-unread'; - -const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png'; - -let trayIcon; - -function getAsset(asset) { - return path.join( - __dirname, '..', '..', 'assets', 'images', 'tray', process.platform, `${asset}.${FILE_EXTENSION}`, - ); -} - -export default (params) => { - // if (process.platform === 'win32' || process.platform === 'linux') { - trayIcon = new Tray(getAsset(INDICATOR_PLAIN)); - const trayMenuTemplate = [ - { - label: 'Show Franz', - click() { - params.mainWindow.show(); - }, - }, { - label: 'Quit Franz', - click() { - params.app.quit(); - }, - }, - ]; - - const trayMenu = Menu.buildFromTemplate(trayMenuTemplate); - trayIcon.setContextMenu(trayMenu); - - trayIcon.on('click', () => { - params.mainWindow.show(); - }); - - ipcMain.on('updateTrayIconIndicator', (event, args) => { - trayIcon.setImage(getAsset(args.count !== 0 ? INDICATOR_UNREAD : INDICATOR_PLAIN)); - - if (process.platform === 'darwin') { - trayIcon.setPressedImage(getAsset(`${args.count !== 0 ? INDICATOR_UNREAD : INDICATOR_PLAIN}-active`)); - } - }); -}; -- cgit v1.2.3-70-g09d2 From 9479bf3db965bd8cb4d7c2318204e87d24bc7a56 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 19 Oct 2017 10:56:58 +0200 Subject: remove unnecessary platform check --- src/electron/ipc-api/settings.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js index 1d7eafa6c..995b28fbd 100644 --- a/src/electron/ipc-api/settings.js +++ b/src/electron/ipc-api/settings.js @@ -1,10 +1,7 @@ import { ipcMain } from 'electron'; export default (params) => { - if (process.platform === 'darwin' || process.platform === 'win32') { - // eslint-disable-next-line - ipcMain.on('settings', (event, args) => { - params.settings.set(args); - }); - } + ipcMain.on('settings', (event, args) => { + params.settings.set(args); + }); }; -- cgit v1.2.3-70-g09d2 From ef503a1e29a540c7318efb5f2018efbf00706198 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 19 Oct 2017 11:15:25 +0200 Subject: Add option to disable system tray icon --- .../settings/settings/EditSettingsForm.js | 1 + src/config.js | 10 ++++ src/containers/settings/EditSettingsScreen.js | 23 ++++++-- src/electron/Settings.js | 14 ++++- src/electron/ipc-api/appIndicator.js | 45 +++++---------- src/i18n/locales/en-US.json | 1 + src/index.js | 25 ++++++--- src/lib/Tray.js | 64 ++++++++++++++++++++++ 8 files changed, 136 insertions(+), 47 deletions(-) create mode 100644 src/lib/Tray.js diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 02736dbb9..5675fecf4 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -115,6 +115,7 @@ export default class EditSettingsForm extends Component {

{intl.formatMessage(messages.headlineGeneral)}

+ {process.platform === 'win32' && ( )} diff --git a/src/config.js b/src/config.js index acbf57f3c..0a4856ece 100644 --- a/src/config.js +++ b/src/config.js @@ -3,3 +3,13 @@ export const LOCAL_API = 'http://localhost:3000'; export const DEV_API = 'https://dev.franzinfra.com'; export const LIVE_API = 'https://api.franzinfra.com'; export const GA_ID = 'UA-74126766-6'; + +export const DEFAULT_APP_SETTINGS = { + autoLaunchOnStart: true, + autoLaunchInBackground: false, + runInBackground: false, + enableSystemTray: true, + minimizeToSystemTray: false, + locale: 'en-us', // TODO: Replace with proper solution once translations are in + beta: false, +}; diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 0e17cafce..6dc2175e1 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -9,6 +9,7 @@ import UserStore from '../../stores/UserStore'; import Form from '../../lib/Form'; import languages from '../../i18n/languages'; import { gaPage } from '../../lib/analytics'; +import { DEFAULT_APP_SETTINGS } from '../../config'; import EditSettingsForm from '../../components/settings/settings/EditSettingsForm'; @@ -26,6 +27,10 @@ const messages = defineMessages({ id: 'settings.app.form.runInBackground', defaultMessage: '!!!Keep Franz in background when closing the window', }, + enableSystemTray: { + id: 'settings.app.form.enableSystemTray', + defaultMessage: '!!!Show Franz in system tray', + }, minimizeToSystemTray: { id: 'settings.app.form.minimizeToSystemTray', defaultMessage: '!!!Minimize Franz to system tray', @@ -61,6 +66,7 @@ export default class EditSettingsScreen extends Component { settings.update({ settings: { runInBackground: settingsData.runInBackground, + enableSystemTray: settingsData.enableSystemTray, minimizeToSystemTray: settingsData.minimizeToSystemTray, locale: settingsData.locale, beta: settingsData.beta, @@ -91,33 +97,38 @@ export default class EditSettingsScreen extends Component { autoLaunchOnStart: { label: intl.formatMessage(messages.autoLaunchOnStart), value: app.autoLaunchOnStart, - default: true, + default: DEFAULT_APP_SETTINGS.autoLaunchOnStart, }, autoLaunchInBackground: { label: intl.formatMessage(messages.autoLaunchInBackground), value: app.launchInBackground, - default: false, + default: DEFAULT_APP_SETTINGS.autoLaunchInBackground, }, runInBackground: { label: intl.formatMessage(messages.runInBackground), value: settings.all.runInBackground, - default: true, + default: DEFAULT_APP_SETTINGS.runInBackground, + }, + enableSystemTray: { + label: intl.formatMessage(messages.enableSystemTray), + value: settings.all.enableSystemTray, + default: DEFAULT_APP_SETTINGS.enableSystemTray, }, minimizeToSystemTray: { label: intl.formatMessage(messages.minimizeToSystemTray), value: settings.all.minimizeToSystemTray, - default: false, + default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, }, locale: { label: intl.formatMessage(messages.language), value: app.locale, options, - default: 'en-US', + default: DEFAULT_APP_SETTINGS.locale, }, beta: { label: intl.formatMessage(messages.beta), value: user.data.beta, - default: false, + default: DEFAULT_APP_SETTINGS.beta, }, }, }; diff --git a/src/electron/Settings.js b/src/electron/Settings.js index 049a08296..824b4c20c 100644 --- a/src/electron/Settings.js +++ b/src/electron/Settings.js @@ -1,5 +1,17 @@ +import { observable } from 'mobx'; + +import { DEFAULT_APP_SETTINGS } from '../config'; + export default class Settings { - store = {}; + @observable store = { + autoLaunchOnStart: DEFAULT_APP_SETTINGS.autoLaunchOnStart, + autoLaunchInBackground: DEFAULT_APP_SETTINGS.autoLaunchInBackground, + runInBackground: DEFAULT_APP_SETTINGS.runInBackground, + enableSystemTray: DEFAULT_APP_SETTINGS.enableSystemTray, + minimizeToSystemTray: DEFAULT_APP_SETTINGS.minimizeToSystemTray, + locale: DEFAULT_APP_SETTINGS.locale, + beta: DEFAULT_APP_SETTINGS.beta, + }; set(settings) { this.store = Object.assign(this.store, settings); diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js index 576234d25..d31819068 100644 --- a/src/electron/ipc-api/appIndicator.js +++ b/src/electron/ipc-api/appIndicator.js @@ -1,12 +1,11 @@ -import { app, ipcMain, Tray, Menu } from 'electron'; +import { app, ipcMain } from 'electron'; import path from 'path'; +import { autorun } from 'mobx'; -const INDICATOR_TRAY_PLAIN = 'tray'; -const INDICATOR_TRAY_UNREAD = 'tray-unread'; const INDICATOR_TASKBAR = 'taskbar'; - const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png'; -let trayIcon; + +let isTrayIconEnabled; function getAsset(type, asset) { return path.join( @@ -15,26 +14,14 @@ function getAsset(type, asset) { } export default (params) => { - trayIcon = new Tray(getAsset('tray', INDICATOR_TRAY_PLAIN)); - const trayMenuTemplate = [ - { - label: 'Show Franz', - click() { - params.mainWindow.show(); - }, - }, { - label: 'Quit Franz', - click() { - app.quit(); - }, - }, - ]; - - const trayMenu = Menu.buildFromTemplate(trayMenuTemplate); - trayIcon.setContextMenu(trayMenu); + autorun(() => { + isTrayIconEnabled = params.settings.get('enableSystemTray'); - trayIcon.on('click', () => { - params.mainWindow.show(); + if (!isTrayIconEnabled) { + params.trayIcon.hide(); + } else if (isTrayIconEnabled) { + params.trayIcon.show(); + } }); ipcMain.on('updateAppIndicator', (event, args) => { @@ -68,13 +55,7 @@ export default (params) => { } } - // Update system tray - trayIcon.setImage(getAsset('tray', args.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN)); - - if (process.platform === 'darwin') { - trayIcon.setPressedImage( - getAsset('tray', `${args.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN}-active`), - ); - } + // Update Tray + params.trayIcon.setIndicator(args.indicator); }); }; diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 194b8047c..b9ed51b83 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -126,6 +126,7 @@ "settings.app.updateStatusUpToDate": "You are using the latest version of Franz", "settings.app.form.autoLaunchOnStart": "Launch Franz on start", "settings.app.form.autoLaunchInBackground": "Open in background", + "settings.app.form.enableSystemTray": "Show Franz in system tray", "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", "settings.app.form.runInBackground": "Keep Franz in background when closing the window", "settings.app.form.language": "Language", diff --git a/src/index.js b/src/index.js index 3244c44ad..6f45d95b8 100644 --- a/src/index.js +++ b/src/index.js @@ -2,16 +2,18 @@ import { app, BrowserWindow, shell } from 'electron'; import fs from 'fs-extra'; import path from 'path'; -// eslint-disable-next-line +/* eslint-disable */ if (require('electron-squirrel-startup')) app.quit(); -import windowStateKeeper from 'electron-window-state'; // eslint-disable-line +import windowStateKeeper from 'electron-window-state'; -import { isDevMode, isWindows } from './environment'; // eslint-disable-line -import ipcApi from './electron/ipc-api'; // eslint-disable-line -import Settings from './electron/Settings'; // eslint-disable-line -import { appId } from './package.json'; // eslint-disable-line -import './electron/exception'; // eslint-disable-line +import { isDevMode, isWindows } from './environment'; +import ipcApi from './electron/ipc-api'; +import Tray from './lib/Tray'; +import Settings from './electron/Settings'; +import { appId } from './package.json'; +import './electron/exception'; +/* eslint-enable */ // Keep a global reference of the window object, if you don't, the window will // be closed automatically when the JavaScript object is garbage collected. @@ -47,8 +49,11 @@ const createWindow = async () => { autoHideMenuBar: true, }); + // Initialize System Tray + const trayIcon = new Tray(mainWindow); + // Initialize ipcApi - ipcApi({ mainWindow, settings }); + ipcApi({ mainWindow, settings, trayIcon }); // Manage Window State mainWindowState.manage(mainWindow); @@ -102,6 +107,10 @@ const createWindow = async () => { if (app.wasMaximized) { mainWindow.maximize(); } + + if (!settings.get('enableSystemTray')) { + trayIcon.hide(); + } }); mainWindow.on('show', () => { diff --git a/src/lib/Tray.js b/src/lib/Tray.js new file mode 100644 index 000000000..631342b24 --- /dev/null +++ b/src/lib/Tray.js @@ -0,0 +1,64 @@ +import { app, Tray, Menu } from 'electron'; +import path from 'path'; + +const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png'; +const INDICATOR_TRAY_PLAIN = 'tray'; +const INDICATOR_TRAY_UNREAD = 'tray-unread'; + +function getAsset(type, asset) { + return path.join( + __dirname, '..', 'assets', 'images', type, process.platform, `${asset}.${FILE_EXTENSION}`, + ); +} + +export default class TrayIcon { + mainWindow = null; + trayIcon = null; + + constructor(mainWindow) { + this.mainWindow = mainWindow; + } + + show() { + this.trayIcon = new Tray(getAsset('tray', INDICATOR_TRAY_PLAIN)); + const trayMenuTemplate = [ + { + label: 'Show Franz', + click() { + this.mainWindow.show(); + }, + }, { + label: 'Quit Franz', + click() { + app.quit(); + }, + }, + ]; + + const trayMenu = Menu.buildFromTemplate(trayMenuTemplate); + this.trayIcon.setContextMenu(trayMenu); + + this.trayIcon.on('click', () => { + this.mainWindow.show(); + }); + } + + hide() { + if (this.trayIcon) { + this.trayIcon.destroy(); + this.trayIcon = null; + } + } + + setIndicator(indicator) { + if (!this.trayIcon) return; + + this.trayIcon.setImage(getAsset('tray', indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN)); + + if (process.platform === 'darwin') { + this.trayIcon.setPressedImage( + getAsset('tray', `${indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN}-active`), + ); + } + } +} -- cgit v1.2.3-70-g09d2 From 9825e2aabceea0c1bc987abb6834051bfc99ba54 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 19 Oct 2017 15:23:02 +0200 Subject: Display system tray icon when minimizing to system tray --- src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.js b/src/index.js index 6f45d95b8..e7fa7da6d 100644 --- a/src/index.js +++ b/src/index.js @@ -90,6 +90,7 @@ const createWindow = async () => { if (settings.get('minimizeToSystemTray')) { mainWindow.setSkipTaskbar(true); + trayIcon.show(); } }); -- cgit v1.2.3-70-g09d2 From c62f3fcde5ad033c27fb65b1642442a4a6d4009b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 19 Oct 2017 15:46:02 +0200 Subject: Reset travis env vars [skip appveyor] It's not like I enjoy re-re-re-re-setting the travis keys. So let's use this commit message deep down here to secretly vent. --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b98db62a9..d3a827553 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,13 +22,13 @@ cache: yarn notifications: email: false slack: - secure: 0rWztugXppPLIqup6cJ0QplJqtZ4XYzN+qgdyY2ARyPbJkjihfp0qWOiEZfNWIuUCxX2bZXODaEb1Jod6mNfiCQdIs3pW8EUD/cVSDul8jBwXSTwTyAAz4pLejXu3ckHVIiXlAriLC6qqedh2Rl9oAH6JumRmuyb0UTAG0O3Btm3lGM3Cwo3JKt0Zpvly2nBlUI1waSiG11QSx5olq+EDiYvMCzW5mpulwRwnXaOdoIWGBFqnYTFoeS/rLi5IE56yvrYODJPl1e0VhW8Zn4WXiVG+qjlREkDFm4qg2u1SQhZQHRBgveRjSxSAblcG5h58NlkijMKBASWMpj2DjAfiDkGMYoRu1IVyHcFlAI8a+wcR6HlQzVsu4e6EFMyzx33vVVUWovwO+BcxVpME25BZn96eC8P6XE2ruOHahKstEt310dieZZRE/gteBokGh3utA2DV6002GSFYlwqqJ9q/5c5wyhD6cefxYSpzivOqCoiUAq3HW1Nahb4l+EVikTydFkLY0et3f/eV/kD/9yJfZJcttVSTL5Gv6gK4ROjPTJ/UPUkqsVBUdxVrnXiXL8SBESFsRHdHnSHMTkHh74dCrbyqot4pW38yLOmVATCEukm4Cd5N5wOUTGRA0nKon7/pCWoJg0wIH8N9FEtZbrNrD2FrkQbVgCJLXrC9jFpr34= + secure: eVryP5RSaK0zOTZGx5zxt64dFzp0QT95XdX4R6XOgw7WUXbAatO4pLRrJzxi+Ur5bQDPD4hroewAJ77gGSUasFHVb+seiCFwHaszQtq8m8rVh9P/tUG+JP7U8gcOR7nTVhNw5HF5DUO8j8iMqpdvievBQ1KbnYALwcQQj1W/T+UbFCyWYaa3VpJCdOUnbJadeMKcMws9aSStZcQ3wUIvDG3YbpNH02lU3vjU80Y0dMFlGfm8DI9h7pdXQM4VQdyAdtf2fSYV1OMRE7lU2bJP6BX5qcq3+oYty554owVLdF4yBmaFKcB/OOqreOV/GyKLVhZtJIGg00+xTORVBl+1nyO1RsIyCd9FwvwvCRk/f/Nb5j9o96TqIRdssXM3yptVV7cXP0Qwt99BVjice4cb6fXMnu1g9e7kR4K5o/lLijw2CfGcneETj/jh479efCrf4CTX2wRZ6dggE6XQ2zxk6nVz+Y/8HrK9QrAsUlbZcJjCx4oDFCuubP6yccc3NCOd54SdFf0STVt4Yq+63eX8yJhEC2iiVrr9UHrS/9mVxG+pojhyZgOPNYeEvx99nozy2Z9txYrsB9dbqTNmNRVuZozuM8HRDL35l50ZvBALQkj0iqpIGjVEfE3+yc08Idk7Y+cLkuModxtBT4r3cT9EkI62CkhglYMFrR+wVz3HfyA= deploy: provider: s3 access_key_id: AKIAI6ZWIP2OWZUCXIGA secret_access_key: - secure: NSST9RjAG6v57MQgFKXckah7k2TMcbozpMN7IAdBmyIvwDlRN6ELAMCynknXDSLE6b6LKyhsQ/i6ykSuZxVoHzRyY9z28lJhLkGqCeABqSAhcwQ6gWxetFXGqIV7o/oxTVMS3cDrUdkfUPCQRUgMO1ew0oV7e4HfqIiDYQMMWJY/HGr/LUgNqolrSLGB2GI38/I1nrhPHm3gwa/xYgKUNsO6plPS/YzC6oF/edstM8oO51Lfpq6+XmDMTUl9qq8GkUaRE4BwdGPG97FOA6Y4ONCeJ3xURkElwcfWab7oW3Mox7hj0Z8vot10cieIWEQjpRP+zO5O2NwUzFRH25FuQf4bbvgH4iWXpLan+qnJ9Ow6cl0lg4+8ESemwDCnKtTGb3ujagTH0S4KqBlwJ6sXFb9U2Diut4cEIT4k3rainjk+8ugIssuJq2TWfB40X49ymPw5BPjJfq2T4fOjx8OKzrBHQ1X6KJd8RhfEoLD3V5eToO5/l13uYOBrjSfyo6afvvUIraVNijSlnqYxPmJYnrLWZUUsTiHZFwSF+x2ffcYKs/tep9zqkZpyV4GhH17HcfuQpx4FUIXqMFmGLRj2uN7FweSVdfbsODhgpIwlpV7gMKONeSmEiFcCMwcRik1UK9off7TE6ZJPzX21BJ8QGM5j7Ot2tif2eGvAv+hUaXc= + secure: HB77zpnMRC0yPa0V+q8H+JzgVFC89OBFZeNdLkZ7jBOGJL2MubgrV2+Qz1JS23972uYLWhY+f0cCc/fbWA19RJ8Bj7MYP/QeSe+psI4F6ge1EjfPzMKkkEtdsUJuV5puEoRQai9sh/tjOsTSyEbwQhyLD/SUlnyimdxsFRujoltyyCqfaHMYU8N9EmS+VIgRXzTOIfQ0u1GcB7E9cnOEdjYWAvUW7vklJ4esVwmPt11KCM+JbOhdenTSr+JaBxopALWs2a3a+wpJ4rsrZlsyAisiOzvgqDlmWRYFyzmIHp0tueiMz5L7sYL/HqgDUkUMVqa3LYzc3iRLab2sm+ukYyNxNK6sNvcWj/gQtSncy5PJ9ZKga1t3CGaze4tGCdAaQdo5lPDywi3Oi3cH7q2gpuubZ5ImgAGkbEDiacZsJR5qRhUZ9gx3gVgSrhKfIx/1lPxsZ8p2LGYL84HKgENOIRWthnzkIgo8xP3ykOun5FihZ8pt3EoJG9NF08YBkMG1FOWxnI2teXb3FZSETt767Qe5DW27WE52daiExO5klgg+dX7ud9f/3G5Fv0auOdAKzj8kM6oyi3YX97nRpoKt/VmeoebUbK6D4WV2lhPLV37xqg1Ak8VfESD8NHsIDm8yS/sIDIQUSsIBDEEt0yBGggkJ/jOmgfk2RPPz2Wy2ClM= bucket: franz-travis region: eu-central-1 local_dir: out @@ -40,6 +40,6 @@ deploy: env: global: - - secure: izVSi10ahT32qqS+Bl0NcKwX2BoCOIJWa2wX3itw9kJvIS4k34OhnzIDhLCa6MEjDdE9eg8jcA9qHmE05qbirLDec623K5Z73zJ+QyD0QTEs7WKNm9C+lc3THtu4NkvIMF4fVS+6uMBpclkuiG5SMOg2bhlSwtccvCrNP/+9pwUUX215S1M53OjGiQNkconWLDMceL9DHnBZT2Q4QHq55w8EKfNnxFHE996TVTLcoLBt8dUp6VCdcmzCGYiWpkD7q5rApX5iy5d9v2dETcvr329/Qgdi5jFj9g6Fvl9h+uE/BpUNnIyWst1r5S7sSTR6pFt5HzJv30T4bmFGz+z2+v/x4Sdrqez4Aa9onGjDNNau8pez1gtopf8vwpKNp8cnRTnRGdMMPRc+7lswfY8Cwa50NV/fxZqbzokBlmTr/t1d3vaxaeHM56c/9POKdwD/I8RYGONc2jDzAmeAJ1gi6Nt6PixTZhhIRc/221mJ3lTlewKPbRZF42/+L0zF/yNxYMQ25mUU+gTkeQ5+XDsZXAD0bOzMSnZ58cAj7qKftu4VrKpB+DmwWwKplLLwnKEzYqUiAnJt+S9yO8S+XFGdhDJqtbuOOlOeA7h/wYPKxanp2dzemU5WffeIrt7lDlFQra1cLUritOqk132daaWwpnDOccwGYTpwmazTvbjSDEU= - - secure: ZOcObe290rPRqlt8v+l7rWvVcKx+0AxVBHMwxu/S9V/PNV3U6yHUZUe6Ur5Y5MAW7WCFLCaKUa3kgyf0g2A1SnTdlwdQ+6t4Y7FyKjHx+AjR0E8WTTl782h0CVqPlGgjeJOpcy1p8yQAppugDvQ6Ov442Yf9f1QhXOWwCB/DTI7WzJPTqq35W5oFRZm5skhyrhZxFujX4OcC+pN7INwWF+u1mh7C0XbzmrlGvl0TK048u4IqFJkBeGOdrRzg0y6eV+tLDk6Ah+O1F5OeOFkHEQhwFpXjcNZ8zDjf3R2xS28+4oCLq2Iin/xKVUlDRg/qG5cXxKPvFteecnor6S65GU80ppYDSdhUhaJMdB1wZGuCogzKJ1s2DmmUv2TE633l+1NXebnQ/nfpVqNr54YqkxDyIA0WaDSAwo496xujdGZfja5Nxv2Ssm8WAfDAgajLYyhSpw7jaIIEw8Ov11XC+BnILU+4CQEKthSyBvEjVO8DtxOl9mOHYy+XTgi67nNi5xv3u1/kUOz1r3VHMyEAKJf1pBpFoOM5S9fpUWeS7rsXh+0mUsoKMDf38SLnQpFMvrygRY9gxAUrYfwupvKUug+p8HkTURo1W3k5oqwZIW12IAxbus7i6uTk4gdnx9fFF/Ljz4irkPPhhuVikT7zF1hvvHQjyhbwvIPQcHu+Ufg= - - secure: dNpyF1AwYIj08pUwT40oSWStGOq9L5pYCuNhQnqIpj6sKgOXg+tkLC2N6mtH93TjeF2OXnTcumjikgNrB+amZhecsiHW94WkRH/mstfuU33GlUX+cAvjt0XPxLtH7YaJTM7xQwQ0dSFS5I0ptSEC57cOoF0MoAWY8ZpDtBR8EDGTfvX+nbVA2un0swWOhfJBLKFe3hv4ODYMi3KelyGmSB0n8DSHpcRpDsFzUNvPuUdxbOebKi46S6SLNWXsl0m9ft3RZLF45HM3qmB+Su5PSgibL/h4fKNMIe2YUpfoXdPbVMh5mlTYoFoLB3Xdi//HabcKoNHLE4aJNkW6RXgy7ZAQJRuXiBPPFktqAgBGnkAFrrS3dtb6b4qfxqoPeXoGMi5ctAVEPBiMaqwZsAIyffokYZyRUX3Qy7dtXCXR1C92WxQc9/Vnv3IJkjpXC4tK68uzady4E+BozoWtGgcZE/w68U/melFeoyLvIPMO93KwciaTIsx5Ck9MGBC8QOEqpH0L2dKntsrihoKB4hCQhGJmx5y2ash0UUWMA2eS7L+Wfp0vU6RbIkgEqHTkb70VuP7pTNYWasBPx+/k1xAJqi6nsGmB2BjC03VQToWfHaLgOVs2tbeolvMKzAdItg668tDGIsXfbKjxwkbexuBkhNKNiUmYd3Ub5Ki4cwg2ObU= + - secure: QQHW81r1ozzT7SvrR+t0szpcqFau4AI14wduZwOUWQk7GxK54Spkp75ebGd1EM1AwNS97DLg8FFNzxEWSoTzn8kDvLQ4UXrQBtqYSGscCHnEFWcReFniYd9H1FRjjVwhgU/9R0nY+eZeArC/6Y4L6ZEQ3leHfG2Wq5wCGpmMhC5ngYN4YXa6KHLj9ZGELqE6nniPcouTtIDbTl4EU0rpwIpEFGGakGZCzz+BLF9ZVYXyEOFHMr1sqzYFngtV5Of3qrEqFW+ea1tDgIPvt1MIkQOASR3X/s8K1LHyj0UugOpUyCgAHtJDDWJa/HGcb86rPdYRUgXAj5CSiGJgsiGv6eDm7Sua1QHaEMZ9YfHB0IuafzOY5cbSEubCuJlnREB7EvMF6nvFMKeRNoEmqbts8wXTzgh3LkeR2LfMedqNQh0ianG5QwXQxtmaoQ7cw2eQEMADe7AbIbJv6El91p/vEHIO7ESNPsYo8vTEannlKswi//VO2Q3iPnHx0VSqIlbMJOkG/624j7aXxsqvufDrWXIOSz0A7kZz4ri2MevGujejeip0k3y6ofZk7eeUmQew4LtzQZiiqJnrOM9DSJ8ziuNplFMNeGILYLx2Ai9v8UGKxr7GhKURlTaQxeqYiT5W0LiDDuzfozCXXhLKdfoGiohi5mUJBjFeGFPv69ME+m4= + - secure: ZBRC0KzerbbUH1WgQq8YYcPiKXWoIifTijP9XfLBM8u+IWnULxyFciFSsFR7g8ck1Tby5ajsqk4Me7OgxHdOn9Ds8xfvGAgP2a1V3qtUcEGUyKjpERc03/n6KTcJdZL2H9Ir1YqnA59UZJFghemannEwNjHUjXIwCQqOij89D4CkMBXI7g52dpYsEiG97fHRh2thI/I9f7x9PuAYKnLC9Zk8bBolIBJZ37/prAQosZH+ZhoqcrZYj7SfuZ7rceZQ7AESfF7Y+P/s1y7k8cbOGvy/Y36U3+M1Iz0PraEyr3kQ5hU1GRgg5IdJzD0HqdjXd42CzH9NlyNwNzehPhgxBvhYdPPhgMX8P5SViD4zjQ7EAn0RzLydp4VuihLmAJhy6aMAZ4VAEy8pucvC1tlfZw/3zuMfOyjThcx1Vk2Db9+ZSP86HI3DAMUpg3cEnZo01Mx498bKJzMR/9JgP2AZ8IWefxin3k2yi3tcwhUB+iDfMJGzeLDMBIMltqM7hz3lwE0hfYkT3bEZujHCAVW2E6+gzdB/IiNbX9iRrYBG23dwWkCWgA55eAu3Rzv5fqZD0PX7/3XjdlFVESnqiJecgu/cXYvsV/eZfXdPi3FuxrpGj4QN9CuHuHoBBlHbOnLur/65iqzgDMdmd33G2VLAGUDwGZK/BmvKD5F8xmCqtYU= + - secure: u5RaqOpoHfnYbKYOzBG9r+6y6wnLTcU49QHgJC2LdXsTBCe5lms4DjxSS5kVqlkLMo8u/Lsd3dORcC0/E4hKaphGgKqHrdPBaJDADMqhY1xD5OwoZbFu8+BKAH0W1cNdr0ZXLFpHQxGcXLg6ofbrZbWg9fYQ5g7Do2ypOXWhoCxsbtF1sOYCyXeOL/O8EqMG0Hif3QOqnpCrdMTL/RjHzc/c6s2sIbsNd8ca4RLHwMZ3yDl1kEePRsB5vR3ZACd7hEDWCeQ9baSmaaAgVudIB6lGyRZgNFTcu5FXyAGfnNQkakHHWtWKXbYEppValTKUGB6t7UmkUw47UsP2t7tTcJG5KpIh5HbN0GoTsabO/OcjIv3cfDIEdsgM44ZoemE0ajdQTLnatVIlTuL1o30IoiIeaBdQUoVJ8TUP41UT8sYYBV7p1ctQluoQ00I3IjmNKnoVkcG/MvVAfk2E50gDswFfH9g5ZOl+vebSV1jYnZVUSdFxqjPEQBL6Ss4dKYpJM9roJstYq27Nm85vUzUd1a50ntdxJyebDEmyc5pGeMM0mS9MwiMAMTEHwvntgv/YBT6ZWyqGMpzIjgDHYVmbICScgutvQ/d+YjheAyTwuDQzvWMCsvgBF7FubPePveQgjZP+QwlyoX0GPfnkmMjRerzyB0ssdSRnVgsdmlhXcuc= -- cgit v1.2.3-70-g09d2 From b6e44c54ac25ce388a31c669f7871c34af31e54a Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 19 Oct 2017 18:15:57 +0200 Subject: Recreate travis vars with git remote called origin [skip appveyor] --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3a827553..12649a5fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,13 +22,13 @@ cache: yarn notifications: email: false slack: - secure: eVryP5RSaK0zOTZGx5zxt64dFzp0QT95XdX4R6XOgw7WUXbAatO4pLRrJzxi+Ur5bQDPD4hroewAJ77gGSUasFHVb+seiCFwHaszQtq8m8rVh9P/tUG+JP7U8gcOR7nTVhNw5HF5DUO8j8iMqpdvievBQ1KbnYALwcQQj1W/T+UbFCyWYaa3VpJCdOUnbJadeMKcMws9aSStZcQ3wUIvDG3YbpNH02lU3vjU80Y0dMFlGfm8DI9h7pdXQM4VQdyAdtf2fSYV1OMRE7lU2bJP6BX5qcq3+oYty554owVLdF4yBmaFKcB/OOqreOV/GyKLVhZtJIGg00+xTORVBl+1nyO1RsIyCd9FwvwvCRk/f/Nb5j9o96TqIRdssXM3yptVV7cXP0Qwt99BVjice4cb6fXMnu1g9e7kR4K5o/lLijw2CfGcneETj/jh479efCrf4CTX2wRZ6dggE6XQ2zxk6nVz+Y/8HrK9QrAsUlbZcJjCx4oDFCuubP6yccc3NCOd54SdFf0STVt4Yq+63eX8yJhEC2iiVrr9UHrS/9mVxG+pojhyZgOPNYeEvx99nozy2Z9txYrsB9dbqTNmNRVuZozuM8HRDL35l50ZvBALQkj0iqpIGjVEfE3+yc08Idk7Y+cLkuModxtBT4r3cT9EkI62CkhglYMFrR+wVz3HfyA= + secure: tpQVKwXXU8ohfIaqOykHTjugLBn5vzwxwRhCo+YcC4NN11H/bqgNr2U9VWYQRc3V8xUE5sELNmag2h5jtQtpx9sZkhbCW4F6RUssGJnovbdYu0X3E1eqfvTuvrKP2K5amVtnrIt92FkVauHqqUwpWM7offysfbIT6YMv3FIPBInaacuz8zoxeUsmoYRujCbX1qeyPbc42EiNRnp2qy9GFJkseZ7pJh9Rtk+stj3ieo72VEdK6+u5xUfjO2QvDCD5zRQTa1QX54PSbKFjxN7Hel9qoYJJ9FPSVlVCvZO1MxJ3pJQPh54WgRapPVBaRexnkH0ZKeTbfV6Eon7k3CNP+mrA/wTY+dadUX8uhRCNvgn7XDyVtxeBI2mMB6YvPVk+u8rc/X8ZYFd/LE78d/ocrzevlNpjF4Qa5vhOlRKjLiUzsLwoXID2zqRQBscMpUxJJv5muVZui7KFh/Y0yzKHmcrzMdHSqMBqsSUcVlgIlRuu1yftZK/s4u4fx8GT5WFisXuXGMdtisIpR39Qriqnc9G52txwWAk5tVXJgu1PUtLEwnyoBeEuwZERMxCFpQeFAvSaNKqPjqJc8m+7EC2VHMAcq5SvorzLdJyq6a2mLcIN2zgJoJMWhAgybfGN9EBfzMJdPbfgjTxntBYx9VnqgM+ubk9rBD2Wtp98Cj3pQu4= deploy: provider: s3 access_key_id: AKIAI6ZWIP2OWZUCXIGA secret_access_key: - secure: HB77zpnMRC0yPa0V+q8H+JzgVFC89OBFZeNdLkZ7jBOGJL2MubgrV2+Qz1JS23972uYLWhY+f0cCc/fbWA19RJ8Bj7MYP/QeSe+psI4F6ge1EjfPzMKkkEtdsUJuV5puEoRQai9sh/tjOsTSyEbwQhyLD/SUlnyimdxsFRujoltyyCqfaHMYU8N9EmS+VIgRXzTOIfQ0u1GcB7E9cnOEdjYWAvUW7vklJ4esVwmPt11KCM+JbOhdenTSr+JaBxopALWs2a3a+wpJ4rsrZlsyAisiOzvgqDlmWRYFyzmIHp0tueiMz5L7sYL/HqgDUkUMVqa3LYzc3iRLab2sm+ukYyNxNK6sNvcWj/gQtSncy5PJ9ZKga1t3CGaze4tGCdAaQdo5lPDywi3Oi3cH7q2gpuubZ5ImgAGkbEDiacZsJR5qRhUZ9gx3gVgSrhKfIx/1lPxsZ8p2LGYL84HKgENOIRWthnzkIgo8xP3ykOun5FihZ8pt3EoJG9NF08YBkMG1FOWxnI2teXb3FZSETt767Qe5DW27WE52daiExO5klgg+dX7ud9f/3G5Fv0auOdAKzj8kM6oyi3YX97nRpoKt/VmeoebUbK6D4WV2lhPLV37xqg1Ak8VfESD8NHsIDm8yS/sIDIQUSsIBDEEt0yBGggkJ/jOmgfk2RPPz2Wy2ClM= + secure: kaPqcvgjx0kQjNEtztw08sp85HKWBU9TPkYRUcccTOGsDifa1tsygjU98o1EjZVXwXBMx/3/GnwN10PayyGe0BqtTZEEvNHs4kA0AQFbkSNwTL8HYFotOfuq25Q6F8fpdhyjE/riiwkETZLTJvUpwAYFWE062GQ+p9ZC76xN/u6UUVCDApqVYPpTmbjUO1+7yaoth7wObCryzJLUzTcO6yWDGmdBGsWrKhCQjX15mL9uYi+kMSOoqa+iUkjC0Vw3o7nzeKit6bxIPPAChGY9le7lw8o0wsxi0KPq0ZGkydz7Nl7Jvdvrr1eFhOBCrP3pXWNPSU6qzBjyK1O8xWxuWVRAF/wnsHkKcCUOiqNf8F+XOaoE8vrGknfJTEwNL4f87rxr+924vQY/0hv8CSevRwbLWQXEPn4xnAG+92ZpHkh5ydykXSxDCHA/W2keS8/K6gayQONupOFqs7gI82hpvebKF50TYowz28oPWvastrh+4nef8MymDQ5+D0Sv5LA4Vt/d2xpku6Z2Z8mpKuwwIRBEjC7FBr+npMszM60WOd2wXuvsbVuCpWS/CyDbuEg1zjOZTdRasKgE/HxpBzdeKnptou8ULtGJVp9MBnQAhXS/3hbP/RAN8xN1dNR2gAi86zomQorZtCH4WC1atnGJbXD1rGQCDXTMISX8RLBO4Cw= bucket: franz-travis region: eu-central-1 local_dir: out @@ -40,6 +40,6 @@ deploy: env: global: - - secure: QQHW81r1ozzT7SvrR+t0szpcqFau4AI14wduZwOUWQk7GxK54Spkp75ebGd1EM1AwNS97DLg8FFNzxEWSoTzn8kDvLQ4UXrQBtqYSGscCHnEFWcReFniYd9H1FRjjVwhgU/9R0nY+eZeArC/6Y4L6ZEQ3leHfG2Wq5wCGpmMhC5ngYN4YXa6KHLj9ZGELqE6nniPcouTtIDbTl4EU0rpwIpEFGGakGZCzz+BLF9ZVYXyEOFHMr1sqzYFngtV5Of3qrEqFW+ea1tDgIPvt1MIkQOASR3X/s8K1LHyj0UugOpUyCgAHtJDDWJa/HGcb86rPdYRUgXAj5CSiGJgsiGv6eDm7Sua1QHaEMZ9YfHB0IuafzOY5cbSEubCuJlnREB7EvMF6nvFMKeRNoEmqbts8wXTzgh3LkeR2LfMedqNQh0ianG5QwXQxtmaoQ7cw2eQEMADe7AbIbJv6El91p/vEHIO7ESNPsYo8vTEannlKswi//VO2Q3iPnHx0VSqIlbMJOkG/624j7aXxsqvufDrWXIOSz0A7kZz4ri2MevGujejeip0k3y6ofZk7eeUmQew4LtzQZiiqJnrOM9DSJ8ziuNplFMNeGILYLx2Ai9v8UGKxr7GhKURlTaQxeqYiT5W0LiDDuzfozCXXhLKdfoGiohi5mUJBjFeGFPv69ME+m4= - - secure: ZBRC0KzerbbUH1WgQq8YYcPiKXWoIifTijP9XfLBM8u+IWnULxyFciFSsFR7g8ck1Tby5ajsqk4Me7OgxHdOn9Ds8xfvGAgP2a1V3qtUcEGUyKjpERc03/n6KTcJdZL2H9Ir1YqnA59UZJFghemannEwNjHUjXIwCQqOij89D4CkMBXI7g52dpYsEiG97fHRh2thI/I9f7x9PuAYKnLC9Zk8bBolIBJZ37/prAQosZH+ZhoqcrZYj7SfuZ7rceZQ7AESfF7Y+P/s1y7k8cbOGvy/Y36U3+M1Iz0PraEyr3kQ5hU1GRgg5IdJzD0HqdjXd42CzH9NlyNwNzehPhgxBvhYdPPhgMX8P5SViD4zjQ7EAn0RzLydp4VuihLmAJhy6aMAZ4VAEy8pucvC1tlfZw/3zuMfOyjThcx1Vk2Db9+ZSP86HI3DAMUpg3cEnZo01Mx498bKJzMR/9JgP2AZ8IWefxin3k2yi3tcwhUB+iDfMJGzeLDMBIMltqM7hz3lwE0hfYkT3bEZujHCAVW2E6+gzdB/IiNbX9iRrYBG23dwWkCWgA55eAu3Rzv5fqZD0PX7/3XjdlFVESnqiJecgu/cXYvsV/eZfXdPi3FuxrpGj4QN9CuHuHoBBlHbOnLur/65iqzgDMdmd33G2VLAGUDwGZK/BmvKD5F8xmCqtYU= - - secure: u5RaqOpoHfnYbKYOzBG9r+6y6wnLTcU49QHgJC2LdXsTBCe5lms4DjxSS5kVqlkLMo8u/Lsd3dORcC0/E4hKaphGgKqHrdPBaJDADMqhY1xD5OwoZbFu8+BKAH0W1cNdr0ZXLFpHQxGcXLg6ofbrZbWg9fYQ5g7Do2ypOXWhoCxsbtF1sOYCyXeOL/O8EqMG0Hif3QOqnpCrdMTL/RjHzc/c6s2sIbsNd8ca4RLHwMZ3yDl1kEePRsB5vR3ZACd7hEDWCeQ9baSmaaAgVudIB6lGyRZgNFTcu5FXyAGfnNQkakHHWtWKXbYEppValTKUGB6t7UmkUw47UsP2t7tTcJG5KpIh5HbN0GoTsabO/OcjIv3cfDIEdsgM44ZoemE0ajdQTLnatVIlTuL1o30IoiIeaBdQUoVJ8TUP41UT8sYYBV7p1ctQluoQ00I3IjmNKnoVkcG/MvVAfk2E50gDswFfH9g5ZOl+vebSV1jYnZVUSdFxqjPEQBL6Ss4dKYpJM9roJstYq27Nm85vUzUd1a50ntdxJyebDEmyc5pGeMM0mS9MwiMAMTEHwvntgv/YBT6ZWyqGMpzIjgDHYVmbICScgutvQ/d+YjheAyTwuDQzvWMCsvgBF7FubPePveQgjZP+QwlyoX0GPfnkmMjRerzyB0ssdSRnVgsdmlhXcuc= + - secure: fO3ffziTCmIsQCacOyyBCuS/Ythlv6TjRjBE0HCVOl/hMTXrZh9sZSBy90Y2t1I2iBhdcYgQM0Qy3eHBAR6g++p0g/Lc7r5q5hCvGFT+RFe5aV9kI7BGUEGQGRPJO1kqSkwu1G6wxm7VdR9Mvn1ZGBTKymi9miNcsKJ5/zq7+dLTFDiQKo8IxxvcKBUMH6zpoHbociiTQE6Y5reJqfC8l75vulqLn1P6CM+E8xhiHYFW1NuYR4ul2JctoQU3uyR1HEDK3Dd6b/vmKf/DS8SJzbsxnDKWebaq5A587bYeABCiipD2OfEfkHYKop8CkQTy7pYQgj1eHg0clZXBCtPKy0rDbMbWCwdaGNJKw2qvAfzxgWUCCBfb8iMT8FESgfOXrCfbIwc4rRCKu89TzG0fm9dkfMiAHVSclPrniaCTKNcKVyt5ZggN18s9ryu2BllBUDgZMdSfonoSaIS6uazY6EXeIef/HQ9YN4gsR7RFLcRjavYYSjNd0BrVQwaXkahudUuTh5ObMOhKLHlv6eJbXB711xTM1V0S4693dXfFremE0RwDddtEXKKuiDP5KAcVvc0DhOsRnuKkOjWKFwsaJGQYbwhivtKnCduY+bAAxC2DFe2A/sNvQXTSVGIwHy1degt7bUurhxh3di6aEmZmsod6fjoYemCb4S8y2JxPa7U= + - secure: mNE1NPynzDXwJ7gzLbaFusdwB+ahxrVA56E0wgMnNWfkm4D9zkAgBCPM52C0YXH1XdarzbX6OYczI9vZAuQ3ZIGt53kkdGc7QtrkIZRSpXfHeBznsC7G4zivwL+FFbrSbK4A/oqazKwnIs0O22dLq7PpoOIiwQfa7/XuTm7I39J7E7XIHEcaGzVZo3zDMKQ3Vc9cDmYOMwtp0YKYnBTBzFJjBLqx3EajHWHivJmfAG15M2dvYM8ptk6Lqaz/y17USqigMhEoG/y62JK+NQX/vhKRca84BnoL9rhM7dG5scoJFpbL9zkq+uY1kHGLqE7T8TSSkoQO26zcCwVj9EhFW2rmqQjcVGlbLeQIvpnq4v0fNmbjkvN2rdRVKdxdD8RPnl9hdrcqd+RTII4RkBVfo5zxGnRPTJUBa9QwJqwZWvm8P+qa4pdHRfs5OveXwMK5HnVe4iMXGTDpcvZNLvFZD39UouVDUBV/2OO/XnQ6EqSXqKmkCjXYs7avmy6sbNFcyaLVl50/k99mMiCUqwl4Fw6AGJ6iwgl/hxc1+sVahpto/bdMcZ9W29VSQ1cqywhynJAmAVHPJTu85J5Ts/m4iZZfg3in/8LIm2BUldTb8r6nMmiz4+plT01VGw87Mx5JKF1GWxAKJc/ZWkFScd/jSsJM5UV0O2r9gN/PCDSl8IY= + - secure: Tv8QVDU76eMM7JKbp5Q4k3n1wmussXXMym/X05CFnPjQ+S6BwAIw+s2uUgAp0a+sMZ+QJ4yzDzhTs6r45whxqFRzTSe8Sm3HNtcIC08RsFD8IAStVWlqYUFNzxH973tsAxU8BeAUldZtVK+r74m47zpXJI/7wr9svBa5ofZ3H4fqfLpDaOPfGxvs+4vyuDE1OQXA7FCv0o8iXJam1gu18j6qE9YxQiBphicbtOjfx7VGBpMs9t2IzNY6qKa3mAGuuPEP1VGj1fOqdshPScnc8JsYPVnH8hI7upEgwFlLgolgJlwF4iNmly+Hun1bA37mUwz8P2uJ9kO7Tm1OA7iR2fbyzwb2Rxr/bCXFS5qz7dKABVDhGsMzsAowftdCRufmgVt551s9F6IeTk3K/Xp5arx0mBSTSec3h5Z4okOcFj0KZBJpIBeOFnoFLor7ILTgczNpuT3N6Kx0yqNxX2zaa5MkNj+sXOciyQfj1C7Of4CrM6LIM384PrnXzDoC3IPapqD+hHO7xuXjMLgM9R2WR2chijnEbS5CnfEUW/bqDtAmNb7bp4Tiz+21dkTz4zsMw1YTIZYlZJ/afpKqiS41gNwvG/6Ot+pxk4kMOckQSa/WxDG6mN6sHTEzLS4wVGBCQ4KN/tDwOUe4t5axnTSyqkHQgp7IPvPqBoJSOi6QNFc= -- cgit v1.2.3-70-g09d2 From ddd151c9e04b824524a21f13468b21baa9ee01fb Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 19 Oct 2017 21:18:58 +0200 Subject: travis vars with --org --- .travis.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 12649a5fd..571d807e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,34 +1,26 @@ language: node_js - before_script: - yarn add global gulp-cli@1.2.2 - yarn add global gulpjs/gulp#4.0 - yarn add global node-sass - yarn install - script: - yarn lint - yarn build - node_js: - '7' - os: osx - osx_image: xcode8.3 - cache: yarn - notifications: email: false slack: - secure: tpQVKwXXU8ohfIaqOykHTjugLBn5vzwxwRhCo+YcC4NN11H/bqgNr2U9VWYQRc3V8xUE5sELNmag2h5jtQtpx9sZkhbCW4F6RUssGJnovbdYu0X3E1eqfvTuvrKP2K5amVtnrIt92FkVauHqqUwpWM7offysfbIT6YMv3FIPBInaacuz8zoxeUsmoYRujCbX1qeyPbc42EiNRnp2qy9GFJkseZ7pJh9Rtk+stj3ieo72VEdK6+u5xUfjO2QvDCD5zRQTa1QX54PSbKFjxN7Hel9qoYJJ9FPSVlVCvZO1MxJ3pJQPh54WgRapPVBaRexnkH0ZKeTbfV6Eon7k3CNP+mrA/wTY+dadUX8uhRCNvgn7XDyVtxeBI2mMB6YvPVk+u8rc/X8ZYFd/LE78d/ocrzevlNpjF4Qa5vhOlRKjLiUzsLwoXID2zqRQBscMpUxJJv5muVZui7KFh/Y0yzKHmcrzMdHSqMBqsSUcVlgIlRuu1yftZK/s4u4fx8GT5WFisXuXGMdtisIpR39Qriqnc9G52txwWAk5tVXJgu1PUtLEwnyoBeEuwZERMxCFpQeFAvSaNKqPjqJc8m+7EC2VHMAcq5SvorzLdJyq6a2mLcIN2zgJoJMWhAgybfGN9EBfzMJdPbfgjTxntBYx9VnqgM+ubk9rBD2Wtp98Cj3pQu4= - + secure: NjEDG+6YvJvFNwRT8t8XyVR145m+Pb1pmYgdBeuhqtJbMAr0IOb0lLLW9ixKEsL1NU+0R58QGiG9qqY+lLnMNpDYjzluFo0gQtl2NJrULT4xUFDSu65XTwoutKyvj+hoCsHiwrSrO2dHTx3ZK2vsSueg+8jM/xss7dTLA6BcTYl14wTOU37PqFQZk9JYR+Dfq1Jjhy/mq4BiAsb/1clNIulkjmRjSm6R0XT4ZsZZfj0ifXhL4cLGsUv2n+iePiX6bLwZPFjXV1COYTBafbCu17gw3nRMdNMMTDLbwrXXdJZFS/EjFOPgOhwF7CkZ3kSpB2ZIcAJxG7iAUl5j+jHBXc5dafRbjzE4oYve1vPexLoV3NjV76uANUFkcli6eHYD0uJoUJGBRbRGWp+8Bbw9EcBsn4s3vbf5XqHX3S46zvGgqX+LyhyMJQtEG/iv+9XOsOql18ryyejij0z1K7DxpI0gLV1ATZCphY1Fyz1yZDGlYN4ej/Rl2P1Q3yXilweJRF7Ts04w4U9iuP1u598/w++CKSu4q4EeEuqT/hIeFQUKUkwCEsO4xa39vhLPaxKrG9UEUH8OXN+NPZyTAK/LKuIX7C56O1kwvWNMWlPmTcvsq2RghvNTwgSGUIO0EKZKrQYAEG3Y/veSt5CgZoNzLgc/6Xj+g7daxUo9heLy26A= deploy: provider: s3 access_key_id: AKIAI6ZWIP2OWZUCXIGA secret_access_key: - secure: kaPqcvgjx0kQjNEtztw08sp85HKWBU9TPkYRUcccTOGsDifa1tsygjU98o1EjZVXwXBMx/3/GnwN10PayyGe0BqtTZEEvNHs4kA0AQFbkSNwTL8HYFotOfuq25Q6F8fpdhyjE/riiwkETZLTJvUpwAYFWE062GQ+p9ZC76xN/u6UUVCDApqVYPpTmbjUO1+7yaoth7wObCryzJLUzTcO6yWDGmdBGsWrKhCQjX15mL9uYi+kMSOoqa+iUkjC0Vw3o7nzeKit6bxIPPAChGY9le7lw8o0wsxi0KPq0ZGkydz7Nl7Jvdvrr1eFhOBCrP3pXWNPSU6qzBjyK1O8xWxuWVRAF/wnsHkKcCUOiqNf8F+XOaoE8vrGknfJTEwNL4f87rxr+924vQY/0hv8CSevRwbLWQXEPn4xnAG+92ZpHkh5ydykXSxDCHA/W2keS8/K6gayQONupOFqs7gI82hpvebKF50TYowz28oPWvastrh+4nef8MymDQ5+D0Sv5LA4Vt/d2xpku6Z2Z8mpKuwwIRBEjC7FBr+npMszM60WOd2wXuvsbVuCpWS/CyDbuEg1zjOZTdRasKgE/HxpBzdeKnptou8ULtGJVp9MBnQAhXS/3hbP/RAN8xN1dNR2gAi86zomQorZtCH4WC1atnGJbXD1rGQCDXTMISX8RLBO4Cw= + secure: hhosIIS7M2j5D8ivNfVEy9jp6oI9x2YKzPS4yDzWutKbILoB2Ii7F6gnaj9l2I9HLX01FE5/jH69rZ5ftP3wmUuywYcsua+Cs5zCnkkjm65WBHnTf5wp91X/tgLtMJNRVWhkxCeVmY7Ijpotmi6rq3GbgCMe2Ok08SExwOdYiCuGWiG5QiIYI/XRPjoUCkP6k4KsZ27HOO2agyXzRRiCI0O2RsSrb41WD4SPlsIW8aECDSOCaF/lIm38o03Q+lX1PtfDjOz9nfu5UUPJDWJNE9rnsa9xbgnNS9qhg/bBOwhtN+21dYCdgScax25kqlnYfT3ZLxBdZSLeM0c0lElaxAdTV/EAYySpnXP2ErfD5sLqVwmcrImKzhGDjyWeQCSBRMC4xfor9taJpB0O0v7iRO7VxszJCYGoUgLAu8kvp2pqkt8s+3t5+JzWdXacHgbKXQkyQWBY1SQzatlqOAAa2wtRv1rk3Xb8czF+4CnJ8n4St4Voo7/pecMwC+KURPemwAEb40OHofj/aRlwgc/kmIV+VUBrPUro5+KJYoQz4zFCchuOa/W6fAN3R9RAn3m4nwxthxI2ckAVdbkJC5c100/NZhPzyfuS+FOLpQ2bbSYfHu/4D7Yji0Pn+Q9lysf27PnnK8m2Ol3eyh+t02CMs6FNW6Wq1YIqarEjF8ouQKE= bucket: franz-travis region: eu-central-1 local_dir: out @@ -37,9 +29,8 @@ deploy: acl: public_read on: all_branches: true - env: global: - - secure: fO3ffziTCmIsQCacOyyBCuS/Ythlv6TjRjBE0HCVOl/hMTXrZh9sZSBy90Y2t1I2iBhdcYgQM0Qy3eHBAR6g++p0g/Lc7r5q5hCvGFT+RFe5aV9kI7BGUEGQGRPJO1kqSkwu1G6wxm7VdR9Mvn1ZGBTKymi9miNcsKJ5/zq7+dLTFDiQKo8IxxvcKBUMH6zpoHbociiTQE6Y5reJqfC8l75vulqLn1P6CM+E8xhiHYFW1NuYR4ul2JctoQU3uyR1HEDK3Dd6b/vmKf/DS8SJzbsxnDKWebaq5A587bYeABCiipD2OfEfkHYKop8CkQTy7pYQgj1eHg0clZXBCtPKy0rDbMbWCwdaGNJKw2qvAfzxgWUCCBfb8iMT8FESgfOXrCfbIwc4rRCKu89TzG0fm9dkfMiAHVSclPrniaCTKNcKVyt5ZggN18s9ryu2BllBUDgZMdSfonoSaIS6uazY6EXeIef/HQ9YN4gsR7RFLcRjavYYSjNd0BrVQwaXkahudUuTh5ObMOhKLHlv6eJbXB711xTM1V0S4693dXfFremE0RwDddtEXKKuiDP5KAcVvc0DhOsRnuKkOjWKFwsaJGQYbwhivtKnCduY+bAAxC2DFe2A/sNvQXTSVGIwHy1degt7bUurhxh3di6aEmZmsod6fjoYemCb4S8y2JxPa7U= - - secure: mNE1NPynzDXwJ7gzLbaFusdwB+ahxrVA56E0wgMnNWfkm4D9zkAgBCPM52C0YXH1XdarzbX6OYczI9vZAuQ3ZIGt53kkdGc7QtrkIZRSpXfHeBznsC7G4zivwL+FFbrSbK4A/oqazKwnIs0O22dLq7PpoOIiwQfa7/XuTm7I39J7E7XIHEcaGzVZo3zDMKQ3Vc9cDmYOMwtp0YKYnBTBzFJjBLqx3EajHWHivJmfAG15M2dvYM8ptk6Lqaz/y17USqigMhEoG/y62JK+NQX/vhKRca84BnoL9rhM7dG5scoJFpbL9zkq+uY1kHGLqE7T8TSSkoQO26zcCwVj9EhFW2rmqQjcVGlbLeQIvpnq4v0fNmbjkvN2rdRVKdxdD8RPnl9hdrcqd+RTII4RkBVfo5zxGnRPTJUBa9QwJqwZWvm8P+qa4pdHRfs5OveXwMK5HnVe4iMXGTDpcvZNLvFZD39UouVDUBV/2OO/XnQ6EqSXqKmkCjXYs7avmy6sbNFcyaLVl50/k99mMiCUqwl4Fw6AGJ6iwgl/hxc1+sVahpto/bdMcZ9W29VSQ1cqywhynJAmAVHPJTu85J5Ts/m4iZZfg3in/8LIm2BUldTb8r6nMmiz4+plT01VGw87Mx5JKF1GWxAKJc/ZWkFScd/jSsJM5UV0O2r9gN/PCDSl8IY= - - secure: Tv8QVDU76eMM7JKbp5Q4k3n1wmussXXMym/X05CFnPjQ+S6BwAIw+s2uUgAp0a+sMZ+QJ4yzDzhTs6r45whxqFRzTSe8Sm3HNtcIC08RsFD8IAStVWlqYUFNzxH973tsAxU8BeAUldZtVK+r74m47zpXJI/7wr9svBa5ofZ3H4fqfLpDaOPfGxvs+4vyuDE1OQXA7FCv0o8iXJam1gu18j6qE9YxQiBphicbtOjfx7VGBpMs9t2IzNY6qKa3mAGuuPEP1VGj1fOqdshPScnc8JsYPVnH8hI7upEgwFlLgolgJlwF4iNmly+Hun1bA37mUwz8P2uJ9kO7Tm1OA7iR2fbyzwb2Rxr/bCXFS5qz7dKABVDhGsMzsAowftdCRufmgVt551s9F6IeTk3K/Xp5arx0mBSTSec3h5Z4okOcFj0KZBJpIBeOFnoFLor7ILTgczNpuT3N6Kx0yqNxX2zaa5MkNj+sXOciyQfj1C7Of4CrM6LIM384PrnXzDoC3IPapqD+hHO7xuXjMLgM9R2WR2chijnEbS5CnfEUW/bqDtAmNb7bp4Tiz+21dkTz4zsMw1YTIZYlZJ/afpKqiS41gNwvG/6Ot+pxk4kMOckQSa/WxDG6mN6sHTEzLS4wVGBCQ4KN/tDwOUe4t5axnTSyqkHQgp7IPvPqBoJSOi6QNFc= + - secure: fddJzSmNYVX024jnhnFXEuAK1spEYi3y3RZdWaBtjQnzoObAxkcRW263JNpXQy+b7egnp2hSy8FvlQU+L967911F5Y70Pe3An4oI72hnS3DL4Njp2Dw5PwviwMA+X2ddWhzK4+k/JU6r8jBv1FGQ6ZjwSeaO/t8UKOsE8wDBFLRhnHqoR7QbM7zmKjzh/1oofunGbHsPOHmN4f7jBwSuSFTZltEENcQg3ZP++0NHU8UJdlpfqZOkro8v4AJMngAHeHlNtjwaAHdVv+6+kkwc4E/0Cy6YNyyBkbzipyngNY3GwnwzmNzvsfICD1TGklksjBlMQq7ld7eCiaYRNvyHVEmXJ17qlq7HhxkYgNy32hPRwb5Cv6o4M4tv8qS8UUk4W1RvBJ5fcmfZGQwGXPyQ/m85RJtrNfbYtr84jYcprTnSeji/9PuZv0f87dxELYm3DYmNUa1cgJqEdLUsEd0bMwUYNLnCSfu4ea2zxwir6LSBtJJCbGKxX87s5IOTrHkrWDe+PWd52v+UjQks7MBRlJnntTWo69Yy+ayXV1TnGVOHA5znHvPOvFlAF+y8tLGd4AGvehK1SAkf0+idmc9Q9xKk0QypT3ibjJui4D50p7sSajkzz3P2pUqOS/9HmjMfPMPN+Nl+48GU0CvB2aBGhdmp9vu54VaFzUaAGNGj4WI= + - secure: AjJvKhQ1jIloxogMdtOzJqovPQUBSA0lfHcRsmGdP8HIRKSRi9tKxCCgicTMpMWfvY7qtdexXBbl2/zl6cOhjfTYeAhNwwCg+dw7OVcE8LUn4E+gYZCYIKbNmmkVKsSckQd4h2IcyvqdqLwzjrEzdF95MoUI8WqdLwvQJLkoIaXju6ZT76FslGSUVXk58ZN7p2nr3kW8V7KclIzn/yyyYXE4bjBmS4djuvCReeSfSViCuX5CGT8avBb/IF/M5S7hcQVybmmalysOrranzSx0o9PPUIT9hHqqRpXW6iss2qVj+kCaFiC3ftlApVgizBoGcNAMA8N7hX8kkEjJSpiy7Vswuev9mVN9X94VwVZGyNvdYD8cKKxqTsfFDZDgefnuSYUhymKSBgM4yScYF6IPNJWFWJTugtVeMJ8ivqZhwJuD20nt6x7gGB1FS6m7axxRWeyp7h0FqWU9l6ZfmwHcRziVKNTk9BB4XIqco9M2wjV/YH321IGVwtVR5y6zty10+xk38TthCOidgBurFlMKbFKH5g9K5+84dhsCW0avMlJ0+QkgId0uAVyho+09Wx4cKqXLfobpznkUX+S0Um6G/NbAaUAU+SqBsm+X9CKFsPd/YJoxLdF7eBCG/3Fy4roKg3J4mBYeXe3wVnGft8Eeg0aNpOArMSStMY337UpdV80= + - secure: WNQBUyNvjTwMFm6pPzNXZYRvgLCTgEm93vLX/0amtr6gT6N8ZsTLL5+Ht3+v51MUOsjEe6tCM4cLSh4wSuwWcSEsUjK0jiqknlpgKKl6xLeo+1t8u6BKSgTpipWqrSD24TbvMrFUyeQrqCGRdZc3Ax/F1ERD81SXcsrg2evCL8g8zsYjxSMXc44drKrvYi68s/5ALrI+oH3t2PYsGuuP1ipj5CbaizUHEa5d8TukHRl96lxoEKCQ4Sa8UXRPNQsdb3TdkVmIEPIoioWU6AMPweBWR6Ky994aKwp0wWn1adWP49v8skMYWbirENniSxShtztF/NYqPQFyoyh0WD/C/ZJPh04HlMxnmQPUROq+LxBFz8WBY1eHDmz6GxH1lDYzneTtlRa5K8izvs2+ROhpVmmKeOgWHaL1ZRMy8Cn3V88kadF7i1K9NnqB6ZPyynJJctj7o0af6Os9/ZPqWfqIOWWeXgfXVzj17xJADfh6Z9epW95hdKZjnIf9IqGAI8aYTqhVL8DKTJ+PSGhJIOEX+ERm+0U9gMlwllwjHCDhBe42zCGuLaWZ239yD1eacM0Ko7yUM+xobiiF0FlB8VI/nBOpGdeUKNLeUfikLHILWd04AVRCNaQU67GMOHekfWdGR8tEh9I/5Y6GJR0IQL5eGmDUjSN0u/Ovss4jSEBOaXo= -- cgit v1.2.3-70-g09d2 From e20f3c81779df33a0f354c361eeff20025b4a4c5 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 20 Oct 2017 10:42:51 +0200 Subject: add travis wait to build command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 571d807e6..b7391caec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_script: - yarn install script: - yarn lint -- yarn build +- travis wait yarn build node_js: - '7' os: osx -- cgit v1.2.3-70-g09d2 From f9a4937eba5496e860c24cdf6aa03cd45f5be30b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 20 Oct 2017 11:13:08 +0200 Subject: fix travis_wait typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b7391caec..d9d9452af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_script: - yarn install script: - yarn lint -- travis wait yarn build +- travis_wait yarn build node_js: - '7' os: osx -- cgit v1.2.3-70-g09d2 From d82ca20b20990c2571da5adb326cd918010ee3cf Mon Sep 17 00:00:00 2001 From: Iulian Date: Fri, 20 Oct 2017 13:01:27 +0300 Subject: Update README with Fedora OS dependencies --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index fec639aff..0e72a37bc 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,11 @@ Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many mor $ apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev ``` +##### Linux (Fedora) +```bash +$ dnf-install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel +``` + #### Install yarn ##### MacOS ```bash -- cgit v1.2.3-70-g09d2 From 6c35801743d56da59711d2eadb5b3c20d78da587 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 20 Oct 2017 13:19:05 +0200 Subject: disable forceCodesigning --- electron-builder.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron-builder.yml b/electron-builder.yml index d9d6ece7c..9cd2f79ef 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -2,7 +2,7 @@ directories: app: ./build output: ./out -forceCodeSigning: true +# forceCodeSigning: true compression: maximum -- cgit v1.2.3-70-g09d2 From f66322d8a888659afcdcf5a5d46112def95fc0fb Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 20 Oct 2017 13:29:54 +0200 Subject: Move linux distribution specific dependencies to /docs --- README.md | 12 ++---------- docs/linux.md | 11 +++++++++++ 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 docs/linux.md diff --git a/README.md b/README.md index 0e72a37bc..2a0d30f1e 100644 --- a/README.md +++ b/README.md @@ -14,16 +14,8 @@ Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many mor ### Preparations -#### Install OS Dependencies -##### Linux (Debian/Ubuntu) -```bash -$ apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev -``` - -##### Linux (Fedora) -```bash -$ dnf-install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel -``` +#### Install Linux OS dependencies +[Guide: Linux distribution specific dependencies](docs/linux.md) #### Install yarn ##### MacOS diff --git a/docs/linux.md b/docs/linux.md new file mode 100644 index 000000000..bd70ad324 --- /dev/null +++ b/docs/linux.md @@ -0,0 +1,11 @@ +# Linux distribution specific dependencies + +## Debian/Ubuntu +```bash +$ apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev +``` + +## Fedora +```bash +$ dnf-install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel +``` -- cgit v1.2.3-70-g09d2