summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Rowe <jroweboy@gmail.com>2017-01-01 05:38:15 +0100
committerJames Rowe <jroweboy@gmail.com>2017-01-01 05:38:15 +0100
commit8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c (patch)
tree21a497158bea0734c857a77d93f43a2ab3577a42
parentTrying to make a consistent nightly versioning (diff)
downloadyuzu-8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c.tar
yuzu-8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c.tar.gz
yuzu-8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c.tar.bz2
yuzu-8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c.tar.lz
yuzu-8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c.tar.xz
yuzu-8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c.tar.zst
yuzu-8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c.zip
-rw-r--r--.travis.yml2
-rw-r--r--appveyor.yml3
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 8b43d6439..414168997 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,4 +33,4 @@ deploy:
file: "${HOME}/build/${TRAVIS_REPO_SLUG}/.travis.descriptor.json"
user: citra-emu
key:
- secure: "MADIMRKlcr+O2iCmavkbIvUWexopOhnzXuDHKXfGyGY93Im8NCTrbb3tDoLH+bRYQrjNCeaV36ffhpDULU+eH11L4yF5/KY4modEKW4sq3cnAJkm5DUOc/sujlRCwzfjg6NFZGhjxfSlt0ltKRdCKEB/j1vR2GD7d/eQ4diJukQ=" \ No newline at end of file
+ secure: "Hdj+/UyDYbvOOXJdlrV0n//t6tAnUqMEy4+Ppb84aF+na4B2hoc+RQ6rfbVXnFE0YKAKJme0J00GVi4JcXViOil2P/wHWxniWBlpz1vHLPT15+p1qi8cPQ0yKMAq9+1kYe6APkHjjsZxHAR6cf1fckI/rPfx/lyuDQOpVq07pJg=" \ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 8a4d1b0da..e4e1045de 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,10 +33,11 @@ after_build:
- ps: |
$GITDATE = $(git show -s --date=short --format='%ad') -replace "-",""
$GITREV = $(git show -s --format='%h')
+ $GIT_LONG_HASH = $(git rev-parse HEAD)
# 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 " ", ""
+ $BINTRAY_VERSION = "nightly-$GIT_LONG_HASH" -replace " ", ""
# set the build names as env vars so the artifacts can upload them
$env:MSVC_BUILD_NAME = $MSVC_BUILD_NAME