mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix AppVeyor build / upload for tags

This commit is contained in:
Ted John 2017-01-29 21:22:43 +00:00
parent 99c68439b1
commit 53d1375a95
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openrct2.proj
View File

@ -288,17 +288,18 @@
<PropertyGroup>
<UploadLink>https://openrct2.org/altapi/?command=push-build</UploadLink>
<UploadFileNameShort>%(UploadArtifacts.Filename)%(UploadArtifacts.Extension)</UploadFileNameShort>
<UploadGitBranch>master</UploadGitBranch>
<UploadGitBranch Condition="'$(GIT_BRANCH)'!=''">$(GIT_BRANCH)</UploadGitBranch>
</PropertyGroup>
<Message Text="Uploading $(UploadFileNameShort)" Importance="high" />
<Error Condition="'$(OPENRCT2_ORG_TOKEN)'==''" Text="OPENRCT2_ORG_TOKEN not set." />
<Error Condition="'$(GIT_COMMIT_SHA1)'==''" Text="GIT_COMMIT_SHA1 not set." />
<Error Condition="'$(GIT_BRANCH)'==''" Text="GIT_BRANCH not set." />
<Exec EchoOff="true" Command="curl.exe -s -o - ^
--form &quot;key=$(OPENRCT2_ORG_TOKEN)&quot; ^
--form &quot;fileName=%(UploadArtifacts.Name)&quot; ^
--form &quot;version=$(Version)&quot; ^
--form &quot;gitHash=$(GIT_COMMIT_SHA1)&quot; ^
--form &quot;gitBranch=$(GIT_BRANCH)&quot; ^
--form &quot;gitBranch=$(UploadGitBranch)&quot; ^
--form &quot;flavourId=%(UploadArtifacts.FlavourId)&quot; ^
--form &quot;file=@%(UploadArtifacts.Identity)&quot; ^
&quot;$(UploadLink)&quot;"

9
scripts/ps/appveyor_install.ps1
View File

@ -52,10 +52,9 @@ else
${env:NO_NSIS} = "true"
}
$env:GIT_TAG = $env:APPVEYOR_REPO_TAG_NAME
$env:GIT_BRANCH = $env:APPVEYOR_REPO_BRANCH
if (${env:APPVEYOR_REPO_TAG} -eq "true")
$env:GIT_TAG = $env:APPVEYOR_REPO_TAG_NAME
if (${env:APPVEYOR_REPO_TAG} -ne "true")
{
$env:GIT_BRANCH = $env:GIT_TAG
$env:GIT_BRANCH = $env:APPVEYOR_REPO_BRANCH
}
$env:GIT_COMMIT_SHA1 = $env:APPVEYOR_REPO_COMMIT
$env:GIT_COMMIT_SHA1 = $env:APPVEYOR_REPO_COMMIT