Skip to content

Commit 3a0b2f9

Browse files
committed
Merge branch 'develop'
# Conflicts: # .appveyor.yml
2 parents efb3ea5 + 1d44c37 commit 3a0b2f9

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

.appveyor.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ artifacts:
8989
#---------------------------------#
9090

9191
deploy:
92+
<<<<<<< HEAD
9293
#- provider: GitHub
9394
# auth_token:
9495
# secure: xxx
@@ -97,6 +98,20 @@ deploy:
9798
# on:
9899
# appveyor_repo_tag: true
99100
# Publish MyGet packages
101+
=======
102+
-provider: GitHub
103+
release: v$(appveyor_build_version)
104+
description: 'Release description'
105+
provider: GitHub
106+
auth_token:
107+
secure: <your encrypted token> # your encrypted token from GitHub
108+
artifact: .\Artifacts\**\*.nupkg # upload all NuGet packages to release assets
109+
draft: false
110+
prerelease: false
111+
on:
112+
branch: master # release from master branch only
113+
appveyor_repo_tag: true # deploy on tag push only
114+
>>>>>>> develop
100115
- provider: NuGet
101116
name: development
102117
server: https://www.myget.org/F/courio-dev/api/v2/package

0 commit comments

Comments
 (0)