diff options
| author | 2016-12-31 19:37:21 -0500 | |
|---|---|---|
| committer | 2016-12-31 19:37:21 -0500 | |
| commit | 4a6cf7ecaf099f3548db2ef6104407d566572bf1 (patch) | |
| tree | c7d362d9fd0e43fc39460b8aed493621f71fd33d | |
| parent | Add deploy to bintray for builds to master (diff) | |
| download | yuzu-4a6cf7ecaf099f3548db2ef6104407d566572bf1.tar.gz yuzu-4a6cf7ecaf099f3548db2ef6104407d566572bf1.tar.xz yuzu-4a6cf7ecaf099f3548db2ef6104407d566572bf1.zip | |
Trying to make a consistent nightly versioning
Diffstat (limited to '')
| -rw-r--r-- | .travis.descriptor.json.in | 2 | ||||
| -rw-r--r-- | appveyor.yml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.descriptor.json.in b/.travis.descriptor.json.in index c0ea7dcc1..fac2eee93 100644 --- a/.travis.descriptor.json.in +++ b/.travis.descriptor.json.in | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | "public_stats": false | 9 | "public_stats": false |
| 10 | }, | 10 | }, |
| 11 | "version": { | 11 | "version": { |
| 12 | "name": "nightly", | 12 | "name": "nightly-@GIT_REV@", |
| 13 | "released": "@BUILD_DATE@", | 13 | "released": "@BUILD_DATE@", |
| 14 | "gpgSign": false | 14 | "gpgSign": false |
| 15 | }, | 15 | }, |
diff --git a/appveyor.yml b/appveyor.yml index 76362bcf2..8a4d1b0da 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
| @@ -36,10 +36,12 @@ after_build: | |||
| 36 | # Where are these spaces coming from? Regardless, let's remove them | 36 | # Where are these spaces coming from? Regardless, let's remove them |
| 37 | $MSVC_BUILD_NAME = "citra-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", "" | 37 | $MSVC_BUILD_NAME = "citra-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", "" |
| 38 | $MSVC_BUILD_PDB = "citra-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", "" | 38 | $MSVC_BUILD_PDB = "citra-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", "" |
| 39 | $BINTRAY_VERSION = "nightly-$GITREV" -replace " ", "" | ||
| 39 | 40 | ||
| 40 | # set the build names as env vars so the artifacts can upload them | 41 | # set the build names as env vars so the artifacts can upload them |
| 41 | $env:MSVC_BUILD_NAME = $MSVC_BUILD_NAME | 42 | $env:MSVC_BUILD_NAME = $MSVC_BUILD_NAME |
| 42 | $env:MSVC_BUILD_PDB = $MSVC_BUILD_PDB | 43 | $env:MSVC_BUILD_PDB = $MSVC_BUILD_PDB |
| 44 | $env:BINTRAY_VERSION = $BINTRAY_VERSION | ||
| 43 | 45 | ||
| 44 | 7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb | 46 | 7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb |
| 45 | rm .\build\bin\release\*.pdb | 47 | rm .\build\bin\release\*.pdb |
| @@ -64,7 +66,7 @@ deploy: | |||
| 64 | subject: citra-emu | 66 | subject: citra-emu |
| 65 | repo: citra | 67 | repo: citra |
| 66 | package: nightly | 68 | package: nightly |
| 67 | version: nightly | 69 | version: $(BINTRAY_VERSION) |
| 68 | publish: true | 70 | publish: true |
| 69 | on: | 71 | on: |
| 70 | branch: master | 72 | branch: master |