Skip to content

Commit 4a1e231

Browse files
committed
Merge branch 'develop'
# Conflicts: # .appveyor.yml
2 parents 21cfac8 + 58ea1b5 commit 4a1e231

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

.appveyor.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ os: Previous Visual Studio 2017
1515
branches:
1616
# whitelist
1717
only:
18+
<<<<<<< HEAD
1819
- master
20+
=======
21+
- /^release\/v\d+\.\d+(\.\d+)?(-\S*)?$/
22+
- /^master$/
23+
>>>>>>> develop
1924

2025
clone_depth: 1
2126

@@ -139,13 +144,13 @@ deploy:
139144
name: production
140145
api_key:
141146
secure: hd7kH5D5DJr+IpC+9zAklVm9r5Pm0Ku0RbMaA7DmReouBhExmFBPTVe+rWtl9zRa
147+
skip_symbols: true
142148
on:
143-
# Only publish from the master branch
144-
branch: master
145149
# Only publish if the trigger was a Git tag
146150
# git tag v0.1.0-beta
147151
# git push origin --tags
148-
appveyor_repo_tag: true
152+
branch: /master|v\d+\.\d+\.\d+[.*]/
153+
APPVEYOR_REPO_TAG: true
149154

150155
# scripts to run before deployment
151156
before_deploy:

0 commit comments

Comments
 (0)