Skip to content

Commit

Permalink
Merge tag 'v1.1.0-Beta' into v1.1.0-Beta-branchfortag
Browse files Browse the repository at this point in the history
released.
  • Loading branch information
Matthew Mulholland committed Jul 1, 2019
2 parents dee20cc + a41e9c5 commit 231007d
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ image: Visual Studio 2017
platform:
- x64

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

environment:
GH_TOKEN:
Expand Down Expand Up @@ -46,11 +46,6 @@ for:
build_script:
- ps: if ($env:APPVEYOR_REPO_TAG -eq "true") { yarn run release:predraft }
configuration: Release
deploy:
provider: Environment
name: production
on:
appveyor_repo_tag: true
-
branches:
only:
Expand Down Expand Up @@ -82,9 +77,8 @@ for:
configuration: Mergeandtest
-
branches:
except:
- develop
- ci
only:
- master
test_script:
- yarn run clean
- yarn run unit
Expand Down

0 comments on commit 231007d

Please sign in to comment.