summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Foley <tfoley@nvidia.com>2017-06-12 08:49:15 -0700
committerTim Foley <tfoley@nvidia.com>2017-06-12 08:50:21 -0700
commitd93c2101475ce6fee27f8188cb194332f1f4ee8d (patch)
tree6ec9a2247863e8ce390f78dc93ecbb38cba3e564
parent62687cd285f675d862c132270d05752afa56d87e (diff)
AppVeyor: Try to fix errors in `appveyor.yml`
- Also add link to build "badge" so that I can more easily watch build status.
-rw-r--r--README.md2
-rw-r--r--appveyor.yml52
2 files changed, 27 insertions, 27 deletions
diff --git a/README.md b/README.md
index 49c4506d5..63608bda6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Slang
-![AppVeyor build status](https://ci.appveyor.com/api/projects/status/kt9ch5niwkslk5p4/branch/master?svg=true)
+[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/kt9ch5niwkslk5p4/branch/master?svg=true)](https://ci.appveyor.com/project/tangent-vector/slang/branch/master)
Slang is a library for compiling real-time shader code.
It can be used with either existing HLSL or GLSL code, or with code written directly in Slang.
diff --git a/appveyor.yml b/appveyor.yml
index 73f976d66..3dd3d93fb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,32 +2,32 @@
# Try to set AppVeyord build "version" to something reasonable,
# based on what we are trying to build.
init:
- - ps: >-
- if ($end:APPVEYOR_REPO_TAG -eq "true")
- {
- # If we are building from a tag in the repository,
- # then use the tag name as the start of the build version
- $versionName = "$($env:APPVEYOR_REPO_TAG_NAME.TrimStart("v"))"
- }
- else if($env:APPVEYOR_PULL_REQUEST_NUMBER)
- {
- # Otherwise, if we are building for a pull request,
- # then use the pull request number to name our build version
- $versionName = "pr$env:APPVEYOR_PULL_REQUEST_NUMBER"
- }
- else
- {
- # Otherwise, just set a build name based on the
- # branch that we are building against
- $versionName = "$env:APPVEYOR_REPO_BRANCH"
- }
- # Finally, we set the AppVeyor build version to use our version
- # name with the build number appended.
- #
- # The string "appveyor" is being included before the build number
- # in case we need to differentiate builds being made with different
- # continuous integration providers.
- Update-AppveyorBuild -Version "$versionName+appveyor.$env:APPVEYOR_BUILD_NUMBER"
+ - ps: |
+ if ($env:APPVEYOR_REPO_TAG -eq "true")
+ {
+ # If we are building from a tag in the repository,
+ # then use the tag name as the start of the build version
+ $versionName = "$($env:APPVEYOR_REPO_TAG_NAME.TrimStart("v"))"
+ }
+ else if($env:APPVEYOR_PULL_REQUEST_NUMBER)
+ {
+ # Otherwise, if we are building for a pull request,
+ # then use the pull request number to name our build version
+ $versionName = "pr$env:APPVEYOR_PULL_REQUEST_NUMBER"
+ }
+ else
+ {
+ # Otherwise, just set a build name based on the
+ # branch that we are building against
+ $versionName = "$env:APPVEYOR_REPO_BRANCH"
+ }
+ # Finally, we set the AppVeyor build version to use our version
+ # name with the build number appended.
+ #
+ # The string "appveyor" is being included before the build number
+ # in case we need to differentiate builds being made with different
+ # continuous integration providers.
+ Update-AppveyorBuild -Version "$versionName+appveyor.$env:APPVEYOR_BUILD_NUMBER"
# Our solution file is currently set up for VS2015
image: Visual Studio 2015