From b900ec20323233aba0a7a2a4d16822618cf0b1a8 Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Wed, 11 Aug 2021 11:11:34 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E6=B7=BB=E5=8A=A0ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 44 ++++++++++++++++++++++++-------------------- package.json | 22 ++++++++++++---------- src/main/index.js | 4 ++++ 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 236d58a..f4b6ecf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,36 +1,40 @@ +# 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 osx_image: xcode8.3 sudo: required dist: trusty language: c matrix: include: - - os: osx - - os: linux - env: CC=clang CXX=clang++ npm_config_clang=1 - compiler: clang + - os: osx + # - os: linux + env: CC=clang CXX=clang++ npm_config_clang=1 + compiler: clang cache: directories: - - node_modules - - "$HOME/.electron" - - "$HOME/.cache" + - node_modules + - "$HOME/.electron" + - "$HOME/.cache" addons: apt: packages: - - libgnome-keyring-dev - - icnsutils + - libgnome-keyring-dev + - icnsutils before_install: -- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install git-lfs; fi -- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils; fi + - mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v1.2.1/git-lfs-$([ + "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-1.2.1.tar.gz + | tar -xz -C /tmp/git-lfs --strip-components 1 && /tmp/git-lfs/git-lfs pull install: -- nvm install 10 -- curl -o- -L https://yarnpkg.com/install.sh | bash -- source ~/.bashrc -- npm install -g xvfb-maybe -- yarn -before_script: -- git lfs pull + - nvm install 8.9 + - curl -o- -L https://yarnpkg.com/install.sh | bash + - source ~/.bashrc + - npm install -g xvfb-maybe + - yarn + - cd docs + - yarn script: -- yarn run build + - npm run release + - sh deploy.sh branches: only: - - master + - master diff --git a/package.json b/package.json index 5e793f4..fc3eaa5 100644 --- a/package.json +++ b/package.json @@ -6,22 +6,16 @@ "license": null, "main": "./dist/electron/main.js", "scripts": { + "release": "vue-cli-service electron:build --publish always", "build": "node .electron-vue/build.js && electron-builder", - "build:dir": "node .electron-vue/build.js && electron-builder --dir", - "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js", - "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js", "dev": "node .electron-vue/dev-runner.js", - "pack": "npm run pack:main && npm run pack:renderer", - "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js", - "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js", - "postinstall": "", "rebuild": " ./node_modules/.bin/electron-rebuild", "rebuild_win": "cnpm rebuild --runtime=electron --target=11.4.10 --disturl=https://atom.io/download/atom-shell --abi=85" }, "build": { "asar": true, "productName": "rubick2", - "appId": "com.example.yourapp2", + "appId": "com.muwoo.rubick", "compression": "maximum", "directories": { "output": "build" @@ -49,10 +43,18 @@ }, "mac": { "icon": "build/icons/icon.icns", - "target": "pkg" + "target": "pkg", + "extendInfo": { + "LSUIElement": 1 + } }, "win": { - "icon": "build/icons/icon.ico" + "icon": "build/icons/icon.ico", + "target": "nsis" + }, + "nsis": { + "oneClick": false, + "allowToChangeInstallationDirectory": true }, "linux": { "icon": "build/icons" diff --git a/src/main/index.js b/src/main/index.js index fec30f9..7d032bb 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -4,6 +4,7 @@ import init from './common/common'; import {autoUpdate} from './common/autoUpdate'; import createTray from './tray'; import {commonConst} from './common/utils'; +import pkg from '../../package.json'; const {main} = require("./browsers")(); @@ -73,6 +74,9 @@ class initApp { this.createWindow(); } }); + if (commonConst.windows()) { + app.setAppUserModelId(pkg.build.appId); + } } onQuit () {