Skip to content

Commit

Permalink
generate versioned appveyor & travis builds
Browse files Browse the repository at this point in the history
f
  • Loading branch information
Stanzilla committed Dec 16, 2018
1 parent b12cbfe commit 862cb47
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ addons:
- libgnome-keyring-dev
- icnsutils
before_install:
- 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
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils; fi
install:
- nvm install 10
Expand All @@ -30,7 +27,14 @@ install:
- npm install -g xvfb-maybe
- yarn
script:
- if [[ "$TRAVIS_TAG" == "" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then npm --no-git-tag-version version prerelease; fi
- yarn run build
deploy:
skip_cleanup: true
provider: script
script: yarn dist
on:
tags: true
branches:
only:
- master
Expand Down
14 changes: 5 additions & 9 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,20 @@ environment:

image: Visual Studio 2017

cache:
- node_modules
- '%USERPROFILE%\.electron'
- '%USERPROFILE%\AppData\Local\Yarn\cache'

init:
- git config --global core.autocrlf input

install:
- ps: Install-Product node 8 x64
- ps: Install-Product node 10 x64
- set CI=true
- ps: if($env:APPVEYOR_REPO_TAG -eq 'False' -and "$env:APPVEYOR_PULL_REQUEST_NUMBER" -eq '') { npm --no-git-tag-version version prerelease }
- yarn
- node --version

build_script:
- yarn build

on_success:
- ps: Get-ChildItem .\build\*.exe | % { Push-AppveyorArtifact $_.FullName }
- ps: Get-ChildItem .\build\*.exe | % { Push-AppveyorArtifact $_.FullName }

test: off
test_script:
#- ps: if($env:APPVEYOR_REPO_TAG -eq 'True') { yarn dist } else { echo "Not a tag, not publishing" }
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"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",
"dist": "yarn run build && build --publish onTagOrDraft",
"lint": "eslint --format node_modules/eslint-formatter-friendly src/.",
"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",
Expand Down

0 comments on commit 862cb47

Please sign in to comment.