summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar James Rowe2017-01-04 21:42:00 -0700
committerGravatar GitHub2017-01-04 21:42:00 -0700
commit4650486b8ea8e3725e966a9f851a5e35e2764875 (patch)
tree639c8a40899fa7742c0cfc0a8cf02b33f9b05327
parentMerge pull request #2405 from jroweboy/nightly-deploy (diff)
parentChange travis to deploy on push to citra-nightly. Add more information to the... (diff)
downloadyuzu-4650486b8ea8e3725e966a9f851a5e35e2764875.tar.gz
yuzu-4650486b8ea8e3725e966a9f851a5e35e2764875.tar.xz
yuzu-4650486b8ea8e3725e966a9f851a5e35e2764875.zip
Merge pull request #2407 from jroweboy/nightly-deploy
Change travis to deploy on push to citra-nightly.
-rw-r--r--.travis.yml2
-rw-r--r--appveyor.yml7
2 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 66eafb6e0..cf1e1e26c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,4 +36,4 @@ deploy:
36 file: "artifacts/*.tar.xz" 36 file: "artifacts/*.tar.xz"
37 skip_cleanup: true 37 skip_cleanup: true
38 on: 38 on:
39 tags: true \ No newline at end of file 39 repo: citra-emu/citra-nightly \ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index d18bb1217..b0df1e436 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -42,7 +42,7 @@ after_build:
42 # set the build names as env vars so the artifacts can upload them 42 # set the build names as env vars so the artifacts can upload them
43 $env:MSVC_BUILD_NAME = $MSVC_BUILD_NAME 43 $env:MSVC_BUILD_NAME = $MSVC_BUILD_NAME
44 $env:MSVC_BUILD_PDB = $MSVC_BUILD_PDB 44 $env:MSVC_BUILD_PDB = $MSVC_BUILD_PDB
45 $env:BINTRAY_VERSION = $BINTRAY_VERSION 45 $env:GITREV = $GITREV
46 46
47 7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb 47 7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb
48 rm .\build\bin\release\*.pdb 48 rm .\build\bin\release\*.pdb
@@ -61,6 +61,11 @@ artifacts:
61 61
62deploy: 62deploy:
63 provider: GitHub 63 provider: GitHub
64 release: nightly-$(appveyor_build_number)
65 description: |
66 Citra nightly releases. Please choose the correct download for your operating system from the list below.
67
68 Short Commit Hash $(GITREV)
64 auth_token: 69 auth_token:
65 secure: "dbpsMC/MgPKWFNJCXpQl4cR8FYhepkPLjgNp/pRMktZ8oLKTqPYErfreaIxb/4P1" 70 secure: "dbpsMC/MgPKWFNJCXpQl4cR8FYhepkPLjgNp/pRMktZ8oLKTqPYErfreaIxb/4P1"
66 artifact: msvcbuild 71 artifact: msvcbuild