Merge pull request #214 from lukeIam/win_CI_improve2

Windows/Appveyor CI build improvements

appveyor.yml

@@ -11,47 +11,62 @@ environment:
   GitHubKey:
     secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW
 install:
-- ps: >-
+- ps: |
     $Env:CurrentCommitSha = "$(git rev-parse --verify HEAD)"
 
-    $Env:githubRepoApiUri = "https://api.github.com/repos/Vocaluxe/Vocaluxe/"
+    if((-not $Env:githubRepoApiUri) -or ($Env:APPVEYOR_ACCOUNT_NAME -eq "VocaluxeBuildBot")){
+        $Env:githubRepoApiUri = "https://api.github.com/repos/Vocaluxe/Vocaluxe/"
+    }
+
+    Write-Host "GitHub api url: $Env:githubRepoApiUri"
 
     ./.appveyor/gitDescribe.ps1
     
     $Env:GIT_VERSION_TAG = $Env:VersionTag    
+    Write-Host "GIT_VERSION_TAG: $Env:GIT_VERSION_TAG"
 
     if($Env:APPVEYOR_REPO_TAG -eq "true"){
-
+        $Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_TAG_NAME 
-    $Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_TAG_NAME
-
     }
-
     else{
-
+        $Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_BRANCH
-    $Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK = $Env:APPVEYOR_REPO_BRANCH
-
     }    
-
-    ./.appveyor/moveTagForSpecialBranches.ps1
 before_build:
 - ps: >-
     nuget restore -DisableParallelProcessing
 
-    #(Get-Content -Encoding UTF8 'PitchTracker\PitchTracker.vcxproj') | Foreach-Object {$_ -replace 'v110_xp', 'v120_xp'} | Set-Content -Encoding UTF8 'PitchTracker\PitchTracker.vcxproj'
 build:
   project: Vocaluxe.sln
   verbosity: normal
 after_build:
-- ps: >-
+- ps: |
     cd Output
 
-    7z a "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM).zip" *
+    $Env:MAIN_REPO = $False
 
-    appveyor PushArtifact "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM).zip" -FileName "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM).zip" -DeploymentName ReleaseZip
+    if($Env:APPVEYOR_REPO_NAME -eq "Vocaluxe/Vocaluxe"){
+        $Env:MAIN_REPO = $True
+        Write-Host "Main repo Vocaluxe/Vocaluxe detected"
+    }
+
+    $forkBuildTag = ""
+    if(($Env:MAIN_REPO -ne $True) -or ($Env:APPVEYOR_ACCOUNT_NAME -ne "VocaluxeBuildBot")){
+        $forkBuildTag = "_non-official-by-$Env:APPVEYOR_ACCOUNT_NAME"
+        Write-Host "Non official build detected: $Env:APPVEYOR_REPO_NAME by $Env:APPVEYOR_ACCOUNT_NAME"
+    }
+
+    7z a "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip" *
+
+    appveyor PushArtifact "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip" -FileName "Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip" -DeploymentName ReleaseZip
 
     cd ..
     
-    .\.appveyor\nightlyDetect.ps1
+    Write-Host "Created artifact: Vocaluxe_$($Env:TAG_NAME_WITH_BRANCH_NAME_FALLBACK)_Windows_$($Env:PLATFORM)$forkBuildTag.zip"
+    
+    if($Env:MAIN_REPO -eq $True){
+        .\.appveyor\nightlyDetect.ps1
+        .\.appveyor\moveTagForSpecialBranches.ps1
+    }
 test: off
 before_deploy:
 - ps: ./.appveyor/prepareDeploy.ps1
@@ -67,6 +82,7 @@ deploy:
   on:
     APPVEYOR_REPO_TAG: true
     NIGHTLY_BUILD: false
+    MAIN_REPO: true
 - provider: GitHub
   tag: $(APPVEYOR_REPO_TAG_NAME)
   release: Latest Nightly build
@@ -77,3 +93,4 @@ deploy:
   on:
     APPVEYOR_REPO_TAG: true
     NIGHTLY_BUILD: true
+    MAIN_REPO: true