mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-20 18:33:24 +02:00
Merge pull request #2405 from jroweboy/nightly-deploy
Change deploy to use github releases instead
This commit is contained in:
commit
0920950d5e
@ -1,23 +0,0 @@
|
|||||||
{
|
|
||||||
"package": {
|
|
||||||
"name": "nightly",
|
|
||||||
"repo": "citra",
|
|
||||||
"subject": "citra-emu",
|
|
||||||
"desc": "Build created on @BUILD_DATE@",
|
|
||||||
"website_url": "www.citra-emu.org",
|
|
||||||
"public_download_numbers": false,
|
|
||||||
"public_stats": false
|
|
||||||
},
|
|
||||||
"version": {
|
|
||||||
"name": "nightly-@GIT_REV@",
|
|
||||||
"released": "@BUILD_DATE@",
|
|
||||||
"gpgSign": false
|
|
||||||
},
|
|
||||||
"files": [
|
|
||||||
{
|
|
||||||
"includePattern": "artifacts/(.*\\.tar.xz)",
|
|
||||||
"uploadPattern": "$1"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"publish": true
|
|
||||||
}
|
|
13
.travis.yml
13
.travis.yml
@ -29,8 +29,11 @@ script: "./.travis-build.sh"
|
|||||||
after_success: "./.travis-upload.sh"
|
after_success: "./.travis-upload.sh"
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
provider: bintray
|
provider: releases
|
||||||
file: "${HOME}/build/${TRAVIS_REPO_SLUG}/.travis.descriptor.json"
|
api_key:
|
||||||
user: citra-emu
|
secure: Mck15DIWaJdxDiS3aYVlM9N3G6y8VKUI1rnwII7/iolfm1s94U+tgvbheZDmT7SSbFyaGaYO/E8HrV/uZR9Vvs7ev20sHsTN1u60OTWfDIIyHs9SqjhcGbtq95m9/dMFschOYqTOR+gAs5BsxjuoeAotHdhpQEwvkO2oo5oR0zhGy45gjFnVvtcxT/IfpZBIpVgcK3aLb9zT6ekcJbSiPmEB15iLq3xXd0nFUNtEZdX3D6Veye4n5jB6n72qN8JVoKvPZAwaC2K0pZxpcGJaXDchLsw1q+4eCvdz6UJfUemeQ/uMAmjfeQ3wrzYGXe3nCM3WmX5wosCsB0mw4zYatzl3si6CZ1W+0GkV4Rwlx03dfp7v3EeFhTsXYCaXqhwuLZnWOLUik8t9vaSoFUx4nUIRwfO9kAMUJQSpLuHNO2nT01s3GxvqxzczuLQ9he5nGSi0RRodUzDwek1qUp6I4uV3gRHKz4B07YIc1i2fK88NLXjyQ0uLVZ+7Oq1+kgDp6+N7vvXXZ5qZ17tdaysSbKEE0Y8zsoXw7Rk1tPN19vrCS+TSpomNMyQyne1k+I5iZ/qkxPTLAS5qI6Utc2dL3GJdxWRAEfGNO9AIX3GV/jmmKfdcvwGsCYP8hxqs5vLYfgacw3D8NLf1941lQUwavC17jm9EV9g5G3Pn1Cp516E=
|
||||||
key:
|
file_glob: true
|
||||||
secure: "TqnAlO0AXxIsHGWcjEP2BVzSs26ErpGPRLMTShVfqaHBPCIfx1UtTcQltl5FVj3HdGKWjw3PgOui/XENVDTdYIwJZN0ziTwb59wcgC5agUmGZhaXMoWjBNxY5lEaSsKZfObgJRWUGaHUSS0KQo0Owlm1u4ORDwz7zagM3/hocKs="
|
file: "artifacts/*.tar.xz"
|
||||||
|
skip_cleanup: true
|
||||||
|
on:
|
||||||
|
tags: true
|
@ -253,11 +253,6 @@ get_git_head_revision(GIT_REF_SPEC GIT_REV)
|
|||||||
git_describe(GIT_DESC --always --long --dirty)
|
git_describe(GIT_DESC --always --long --dirty)
|
||||||
git_branch_name(GIT_BRANCH)
|
git_branch_name(GIT_BRANCH)
|
||||||
|
|
||||||
# configure the bintray travis release json
|
|
||||||
string(TIMESTAMP BUILD_DATE "%Y-%m-%d")
|
|
||||||
configure_file("${CMAKE_SOURCE_DIR}/.travis.descriptor.json.in" "${CMAKE_SOURCE_DIR}/.travis.descriptor.json" @ONLY)
|
|
||||||
unset(BUILD_DATE)
|
|
||||||
|
|
||||||
set(INI_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/inih")
|
set(INI_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/inih")
|
||||||
include_directories(${INI_PREFIX})
|
include_directories(${INI_PREFIX})
|
||||||
add_subdirectory(${INI_PREFIX})
|
add_subdirectory(${INI_PREFIX})
|
||||||
|
15
appveyor.yml
15
appveyor.yml
@ -60,14 +60,11 @@ artifacts:
|
|||||||
type: zip
|
type: zip
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
- provider: BinTray
|
provider: GitHub
|
||||||
username: citra-emu
|
auth_token:
|
||||||
api_key:
|
secure: "dbpsMC/MgPKWFNJCXpQl4cR8FYhepkPLjgNp/pRMktZ8oLKTqPYErfreaIxb/4P1"
|
||||||
secure: qaZZfXp5Vv9xw5EmCxKLhGnNYhiNMDCdP84l0+h6HetfmvFlvHxyohWEVokLjl7d
|
artifact: msvcbuild
|
||||||
subject: citra-emu
|
draft: false
|
||||||
repo: citra
|
prerelease: false
|
||||||
package: nightly
|
|
||||||
version: $(BINTRAY_VERSION)
|
|
||||||
publish: true
|
|
||||||
on:
|
on:
|
||||||
branch: master
|
branch: master
|
||||||
|
Loading…
Reference in New Issue
Block a user