Skip to content
Permalink
Browse files

Merge master

  • Loading branch information...
Kagu-chan committed Mar 13, 2019
2 parents ee6246f + 449dd8e commit 7ce78ce75d6c086152b9fdd499c28056c1249138
Showing with 38 additions and 14,507 deletions.
  1. +0 −1 .gitignore
  2. +29 −6 .travis.yml
  3. +7 −5 appveyor.yml
  4. +0 −14,490 package-lock.json
  5. +2 −5 package.json
@@ -11,4 +11,3 @@ thumbs.db
!.gitkeep
/bower_components
.env

@@ -1,26 +1,49 @@
sudo: required
dist: trusty
language: node_js
node_js: 10

matrix:
include:
- os: osx
osx_image: xcode8.3
osx_image: xcode9.4
language: node_js
env:
- ELECTRON_CACHE=$HOME/.cache/electron
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
- os: linux
env: CC=clang CXX=clang++ npm_config_clang=1
compiler: clang

branches:
only:
- master
- /^v\d+\.\d+\.\d+\-?[a-z]*$/

node_js:
- '10'
install:
- npm install

before_script:
- npm install

script:
- printf "CLIENT_SECRET=$CLIENT_SECRET\nNODE_ENV=production" > .env
- npm run build
- |
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
docker run --rm \
--env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \
-v ${PWD}:/zerotwo \
-v ~/.cache/electron:/root/.cache/electron \
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
electronuserland/builder:wine \
/bin/bash -c "npm run build --linux --win"
else
npm run build
fi
before_cache:
- rm -rf $HOME/.cache/electron-builder/wine

deploy:
skip_cleanup: true
skip_cleanup: false
provider: releases
api_key:
secure: rU1Y9lKjqH7wtgr04qdSTNrfKRVUxu4zYjTvPa6pNp6NTRwAuPBqwQRWEZQg/tHoY+Jh6to1q8QW4fzQ6prz4r7gOrbKtHn+t6p8SlZ7H3KAi3kek2CRF3dKR/TDXVbWaFCOhewQ5eoEOz7JvNlNcM+Lq3QG3VxkPZrek3ZDAsMdiZddoxvBfaxSAQA/CLKupOD5wpw30gufTTaRaA0SIFeDTU74q2j661UOyySYaAf1XFnFwRa9DS0Wtg4zmZoL4Ib9R6y8Pr3RVoHGFVyG5pWuBFCbx8VxAX0B37iv1/w7ce9pnVdw2jrkxxzzxGUNxlOfr+SLX3UarZ1py+cBGMDXZUi9FnhW9dhdjgHQHhpgGhE4npUbJ2LYcIbSzFM/aeMFsrNGPDXlPARHNiCcc0t1xH7ypjoHYDRpvHz/JLq7v4rmyqGWapOz1H4Y5gnD6MkMML05siRpA6Xh5k0iCaAApzPUv6+vZOzsobK4Ww8M0bGNiQzST5XY/yHG2Ioo7GXr+HV8CTYGkpJndMldqANyr/LVrl2Tke1TSeSYnd5E/ObSNXQ2g/0RGS/tS3CgrWg+bCKcksEw5td+YaXDdz1u+eMFxEFNjhk3/jZrlhcx4l/2WPm1HeMBsqWYUBdXK2vn41P+DVfSyhx+voKGQsmNc+iXkICyb5vKCyZD6VQ=
@@ -10,19 +10,22 @@ init:
- git config --global core.autocrlf input

install:
- ps: Install-Product node 8
- npm install
- ps: Install-Product node 10
- yarn

environment:
CLIENT_SECRET:
secure: JMBmvZNgm2X7uTsEe1b7sPKoJHSqowjcHxDZ+/vdzGixlY7ycTrYC1Igf9hKQz8U
github_token:
secure: diMKIMZOOqW72A72qO+L0ybzXp1TC8GpG/YdFc6Oi7o/098qezYRnKPDpNkUYF+M
NODE_ENV: production

before_build:
- ps: $env:NODE_ENV="production"
- ps: echo "CLIENT_SECRET=$env:CLIENT_SECRET`r`nNODE_ENV=production" > .env

build_script:
- npm run build
- yarn release

test: off

@@ -39,8 +42,7 @@ deploy:
description: ''
tag: $(appveyor_repo_tag_name)
release: ZeroTwo $(appveyor_repo_tag_name)
auth_token:
secure: 2l9QA3INcc7ZP0Ye2bV5n7cNfi7WpRb2AjX1nSV878So7aX/K8+a+kFwqMWtUsLS
auth_token: $(github_token)
on:
branch: master
appveyor_repo_tag: true

0 comments on commit 7ce78ce

Please sign in to comment.
You can’t perform that action at this time.