Fixing github uri parsing

serialseb · Feb 28, 2017 · 1e9a058 · 1e9a058
1 parent 94edf71
commit 1e9a058
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -30,7 +30,7 @@ platform: Any CPU
 
 cache:
   - src\packages -> **\packages.config
-  - vendor/bundle --> Gemfile.lock
+  - vendor\ -> Gemfile.lock
 
 build:
   parallel: true

diff --git a/build/funcs/Create-Package.ps1 b/build/funcs/Create-Package.ps1
@@ -1,7 +1,8 @@
 $repo = $env:APPVEYOR_REPO_NAME
 
 function Get-GitHubRepo([string]$uri="") {
-    $finalUri = "https://api.github.com/repos/$repo/$uri?access_token=$($env:GITHUB_TOKEN)"
+    if ($uri -ne "" && -not $uri.StartsWith("/"){ $uri = "/$uri" }
+    $finalUri = "https://api.github.com/repos/$repo$uri?access_token=$($env:GITHUB_TOKEN)"
     Invoke-WebRequest -Uri $finalUri | ConvertFrom-Json
 }
 
@@ -12,7 +13,6 @@ $nuspecPath = "$($env:APPVEYOR_BUILD_FOLDER)\$($env:SEB_PROJECT_NAME).nuspec"
 $nuspec = [xml](Get-Content $nuspecPath)
 
 if ($env:APPVEYOR_REPO_TAG -eq $true) {
-    $releaseUri = "https://api.github.com/repos/$($env:APPVEYOR_REPO_NAME)/releases/tags/$($env:APPVEYOR_REPO_TAG_NAME)?access_token=$($env:GITHUB_TOKEN)"
     $releaseNotes = Get-GitHubRepo("releases/tags/$($env:APPVEYOR_REPO_TAG_NAME)").body.Replace('"','\"').Replace('### ', '')
     echo "Release notes: $releaseNotes"
     $nuspec.package.metadata.releaseNotes = $releaseNotes

diff --git a/build/funcs/Set-Version.ps1 b/build/funcs/Set-Version.ps1
@@ -4,7 +4,7 @@ $build = $env:APPVEYOR_BUILD_NUMBER | % PadLeft 4 '0'
 $major = $version.Major
 $branch = $env:APPVEYOR_REPO_BRANCH
 
-if ($env:APPVEYOR_REPO_TAG){
+if ($env:APPVEYOR_REPO_TAG) {
     $version = $env:APPVEYOR_REPO_TAG_NAME
 } else {
     $buildsForBranch = "/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=4000&branch=$branch"