Trying to make a consistent nightly versioning

merge-requests/60/head
James Rowe 2016-12-31 19:37:21 +07:00
parent b03e7bf28f
commit 4a6cf7ecaf
2 changed files with 4 additions and 2 deletions

@ -9,7 +9,7 @@
"public_stats": false "public_stats": false
}, },
"version": { "version": {
"name": "nightly", "name": "nightly-@GIT_REV@",
"released": "@BUILD_DATE@", "released": "@BUILD_DATE@",
"gpgSign": false "gpgSign": false
}, },

@ -36,10 +36,12 @@ after_build:
# Where are these spaces coming from? Regardless, let's remove them # Where are these spaces coming from? Regardless, let's remove them
$MSVC_BUILD_NAME = "citra-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", "" $MSVC_BUILD_NAME = "citra-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", ""
$MSVC_BUILD_PDB = "citra-windows-msvc-$GITDATE-$GITREV-debugsymbols.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 # set the build names as env vars so the artifacts can upload them
$env:MSVC_BUILD_NAME = $MSVC_BUILD_NAME $env:MSVC_BUILD_NAME = $MSVC_BUILD_NAME
$env:MSVC_BUILD_PDB = $MSVC_BUILD_PDB $env:MSVC_BUILD_PDB = $MSVC_BUILD_PDB
$env:BINTRAY_VERSION = $BINTRAY_VERSION
7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb 7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb
rm .\build\bin\release\*.pdb rm .\build\bin\release\*.pdb
@ -64,7 +66,7 @@ deploy:
subject: citra-emu subject: citra-emu
repo: citra repo: citra
package: nightly package: nightly
version: nightly version: $(BINTRAY_VERSION)
publish: true publish: true
on: on:
branch: master branch: master