diff options
| author |  James Rowe | 2016-12-31 23:38:15 -0500 |
|---|---|---|
| committer | James Rowe | 2016-12-31 23:38:15 -0500 |
| commit | 8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c (patch) | |
| tree | 21a497158bea0734c857a77d93f43a2ab3577a42 | |
| parent | Trying to make a consistent nightly versioning (diff) | |
| download | yuzu-8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c.tar.gz yuzu-8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c.tar.xz yuzu-8f6c3b5c20b6fe35ddfe22d2bf6e9562d0f22e4c.zip | |
Try a different encrypted bintray api key for travis. Change appveyor to upload to a long git hash (since travis is stuck uploading to the full hash name)
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 3 |
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: | |||
| 33 | file: "${HOME}/build/${TRAVIS_REPO_SLUG}/.travis.descriptor.json" | 33 | file: "${HOME}/build/${TRAVIS_REPO_SLUG}/.travis.descriptor.json" |
| 34 | user: citra-emu | 34 | user: citra-emu |
| 35 | key: | 35 | key: |
| 36 | secure: "MADIMRKlcr+O2iCmavkbIvUWexopOhnzXuDHKXfGyGY93Im8NCTrbb3tDoLH+bRYQrjNCeaV36ffhpDULU+eH11L4yF5/KY4modEKW4sq3cnAJkm5DUOc/sujlRCwzfjg6NFZGhjxfSlt0ltKRdCKEB/j1vR2GD7d/eQ4diJukQ=" \ No newline at end of file | 36 | 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: | |||
| 33 | - ps: | | 33 | - ps: | |
| 34 | $GITDATE = $(git show -s --date=short --format='%ad') -replace "-","" | 34 | $GITDATE = $(git show -s --date=short --format='%ad') -replace "-","" |
| 35 | $GITREV = $(git show -s --format='%h') | 35 | $GITREV = $(git show -s --format='%h') |
| 36 | $GIT_LONG_HASH = $(git rev-parse HEAD) | ||
| 36 | # Where are these spaces coming from? Regardless, let's remove them | 37 | # Where are these spaces coming from? Regardless, let's remove them |
| 37 | $MSVC_BUILD_NAME = "citra-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", "" | 38 | $MSVC_BUILD_NAME = "citra-windows-msvc-$GITDATE-$GITREV.zip" -replace " ", "" |
| 38 | $MSVC_BUILD_PDB = "citra-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", "" | 39 | $MSVC_BUILD_PDB = "citra-windows-msvc-$GITDATE-$GITREV-debugsymbols.zip" -replace " ", "" |
| 39 | $BINTRAY_VERSION = "nightly-$GITREV" -replace " ", "" | 40 | $BINTRAY_VERSION = "nightly-$GIT_LONG_HASH" -replace " ", "" |
| 40 | 41 | ||
| 41 | # 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 |
| 42 | $env:MSVC_BUILD_NAME = $MSVC_BUILD_NAME | 43 | $env:MSVC_BUILD_NAME = $MSVC_BUILD_NAME |