citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #2390 from jroweboy/bintray 

Try a different encrypted bintray api key for travis.
This commit is contained in:
James Rowe 2016-12-31 23:57:36 -05:00 committed by GitHub
parent bb396ed8fc 8f6c3b5c20
commit 0b897c45d2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -33,4 +33,4 @@ deploy:
file: "${HOME}/build/${TRAVIS_REPO_SLUG}/.travis.descriptor.json" file: "${HOME}/build/${TRAVIS_REPO_SLUG}/.travis.descriptor.json"
user: citra-emu user: citra-emu
key: key:
secure: "MADIMRKlcr+O2iCmavkbIvUWexopOhnzXuDHKXfGyGY93Im8NCTrbb3tDoLH+bRYQrjNCeaV36ffhpDULU+eH11L4yF5/KY4modEKW4sq3cnAJkm5DUOc/sujlRCwzfjg6NFZGhjxfSlt0ltKRdCKEB/j1vR2GD7d/eQ4diJukQ=" secure: "Hdj+/UyDYbvOOXJdlrV0n//t6tAnUqMEy4+Ppb84aF+na4B2hoc+RQ6rfbVXnFE0YKAKJme0J00GVi4JcXViOil2P/wHWxniWBlpz1vHLPT15+p1qi8cPQ0yKMAq9+1kYe6APkHjjsZxHAR6cf1fckI/rPfx/lyuDQOpVq07pJg="

3
appveyor.yml
View File

@ -33,10 +33,11 @@ after_build:
- ps: | - ps: |
$GITDATE = $(git show -s --date=short --format='%ad') -replace "-","" $GITDATE = $(git show -s --date=short --format='%ad') -replace "-",""
$GITREV = $(git show -s --format='%h') $GITREV = $(git show -s --format='%h')
$GIT_LONG_HASH = $(git rev-parse HEAD)
# 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 " ", "" $BINTRAY_VERSION = "nightly-$GIT_LONG_HASH" -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