From 4a6cf7ecaf099f3548db2ef6104407d566572bf1 Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Sat, 31 Dec 2016 19:37:21 -0500
Subject: [PATCH] Trying to make a consistent nightly versioning

---
 .travis.descriptor.json.in | 2 +-
 appveyor.yml               | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.descriptor.json.in b/.travis.descriptor.json.in
index c0ea7dcc16..fac2eee931 100644
--- a/.travis.descriptor.json.in
+++ b/.travis.descriptor.json.in
@@ -9,7 +9,7 @@
         "public_stats": false
     },
     "version": {
-        "name": "nightly",
+        "name": "nightly-@GIT_REV@",
         "released": "@BUILD_DATE@",
         "gpgSign": false
     },
diff --git a/appveyor.yml b/appveyor.yml
index 76362bcf23..8a4d1b0dae 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,10 +36,12 @@ after_build:
         # Where are these spaces coming from? Regardless, let's remove them
         $MSVC_BUILD_NAME = "citra-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", ""
         $MSVC_BUILD_PDB = "citra-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", ""
+        $BINTRAY_VERSION = "nightly-$GITREV" -replace " ", ""
 
         # set the build names as env vars so the artifacts can upload them
         $env:MSVC_BUILD_NAME = $MSVC_BUILD_NAME
         $env:MSVC_BUILD_PDB = $MSVC_BUILD_PDB
+        $env:BINTRAY_VERSION = $BINTRAY_VERSION
 
         7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb
         rm .\build\bin\release\*.pdb
@@ -64,7 +66,7 @@ deploy:
   subject: citra-emu
   repo: citra
   package: nightly
-  version: nightly
+  version: $(BINTRAY_VERSION)
   publish: true
   on:
     branch: master