Fix for setting versions

asb2m10 · Sep 18, 2020 · 8ec75a7 · 8ec75a7
1 parent deb69c1
commit 8ec75a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -6,9 +6,6 @@ trigger:
 pr:
 - master
 
-variables:
-  version: BETA
-
 jobs:
 # We projuce on mac and share the assets so we don't have to run projucer on linux
 - job: Projuce
@@ -173,7 +170,7 @@ jobs:
 
 - job: UpdateGithubRelease
   dependsOn: Build
-  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+  condition: and(and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')), eq(variables['version'], 'Nightly')
 
   steps:
   - task: DownloadPipelineArtifact@0

diff --git a/scripts/set-version.sh b/scripts/set-version.sh
@@ -2,8 +2,8 @@
 
 GIT_TAG=`git rev-parse --short HEAD`
 BUILDDATE=`date +%Y%m%d`
-if [ $1 == "BETA" ]; then 
-    VERSION="${GIT_TAG}-BETA"
+if [ $1 = "Nightly" ]; then 
+    VERSION="${GIT_TAG}-Nightly"
 else
     VERSION=$1
 fi