Skip to content

Commit

Permalink
trigger ci
Browse files Browse the repository at this point in the history
  • Loading branch information
erguotou520 committed Feb 12, 2018
1 parent ba46b45 commit 6cc43d0
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Commented sections below can be used to run tests on the CI server
# https://simulatedgreg.gitbooks.io/electron-vue/content/en/testing.html#on-the-subject-of-ci-testing
on:
condition: "$TRAVIS_COMMIT_MESSAGE =~ ^trigger ci$"
osx_image: xcode8.3
sudo: required
dist: trusty
Expand Down
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ branches:
- master

# skip_non_tags: true
only_commits:
message: /^trigger ci$/

image: Visual Studio 2017
platform:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-ssr",
"version": "0.2.0-beta-4",
"version": "0.2.0-beta-5",
"author": "erguotou <[email protected]>",
"description": "Cross platform ShadowsocksR GUI client built with electron",
"homepage": "https://github.com/erguotou520/electron-ssr/",
Expand Down
2 changes: 1 addition & 1 deletion src/shared/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const EVENT_SSR_DOWNLOAD_MAIN = 'ssr.download.main'
// 由`ipc-main`发出 更新订阅服务器
export const EVENT_SUBSCRIBE_UPDATE_MAIN = 'subscribe.update.main'

// 由`ipc-render`发出 从剪切板添加配置
// 由`ipc-renderer`发出 从剪切板添加配置
export const EVENT_CONFIG_COPY_CLIPBOARD = 'config.copy.board'

// 由`ipc-main`发出 同步`rx`数据
Expand Down

0 comments on commit 6cc43d0

Please sign in to comment.