Permalink
Browse files

Fix build scripts

  • Loading branch information...
1 parent 45bb2cb commit 4d8fcaa1a064bff67523003e29a1f94c6a31d937 @laedit laedit committed Nov 28, 2015
Showing with 21 additions and 16 deletions.
  1. +11 −8 BuildScripts/AppVeyor-Build.ps1
  2. +8 −7 appveyor.yml
  3. +2 −1 src/Pretzel.Logic/Pretzel.Logic.nuspec
@@ -56,19 +56,22 @@ function SetVersion
{
$version = $env:GitVersion_NuGetVersionV2
$tag = $version
- If ($env:appveyor_repo_tag -eq $True)
+ If ($env:APPVEYOR_REPO_TAG -eq $True)
{
- $tag = $env:appveyor_repo_tag_name
+ $tag = $env:APPVEYOR_REPO_TAG_NAME
Set-AppveyorBuildVariable 'releaseDescription' (GetDescriptionFromReleaseNotes)
}
- return $version
+ return New-Object PsObject -Property @{version=$version ; tag=$tag}
}
# Packaging
-function CreatePackage($version)
+function CreatePackage($versionInfos)
{
+ $version = $versionInfos.version
+ $tag = $versionInfos.tag
+
CreateCleanDirectory chocoTemp
# build Pretzel nupkg
@@ -164,9 +167,9 @@ function Build()
ExecuteTests $true
- $version = SetVersion
+ $versionInfos = SetVersion
- CreatePackage $version
+ CreatePackage $versionInfos
}
}
#Local build
@@ -186,9 +189,9 @@ function Build()
ExecuteTests $false
- $version = SetVersion
+ $versionInfos = SetVersion
- CreatePackage $version
+ CreatePackage $versionInfos
}
}
View
@@ -26,17 +26,11 @@ build_script:
test: off
artifacts:
- - path: artifacts\Pretzel.*.nupkg
- name: Pretzel.nupkg
+ - path: artifacts\coverage.xml
- path: artifacts\Pretzel.ScriptCs.*.nupkg
name: Pretzel.ScriptCs.nupkg
- - path: artifacts\coverage.xml
-
- - path: artifacts\Pretzel.*.zip
- name: Pretzel.zip
-
- path: artifacts\Pretzel.ScriptCs.*.zip
name: Pretzel.ScriptCs.zip
@@ -46,6 +40,13 @@ artifacts:
- path: artifacts\Pretzel.Logic.*.symbols.nupkg
name: Pretzel.Logic.symbols.nupkg
+ - path: artifacts\Pretzel.*.nupkg
+ name: Pretzel.nupkg
+
+ - path: artifacts\Pretzel.*.zip
+ name: Pretzel.zip
+
+
deploy:
- provider: GitHub
auth_token:
@@ -10,8 +10,9 @@
<projectUrl>https://github.com/code52/pretzel</projectUrl>
<iconUrl>https://cdn.rawgit.com/Code52/pretzel/master/pretzel.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
- <description>Logic library for [Pretzel](https://github.com/code52/pretzel), useful to make plugins.</description>
+ <description>Logic library for Pretzel (https://github.com/code52/pretzel), useful to make plugins.</description>
<releaseNotes>https://github.com/Code52/pretzel/releases</releaseNotes>
<tags>Pretzel, Jekyll, HTML, Markdown, Liquid, Razor, static</tags>
</metadata>
+ <files />
</package>

0 comments on commit 4d8fcaa

Please sign in to comment.