From 0a6ca01991c1f32e3cdf8fb2a10f18bda50b1d06 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Wed, 4 Jan 2017 20:39:59 -0700 Subject: [PATCH] Change deploy to use github releases instead, but only for the citra-nightly repo --- .travis.descriptor.json.in | 23 ----------------------- .travis.yml | 13 ++++++++----- CMakeLists.txt | 5 ----- appveyor.yml | 15 ++++++--------- 4 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 .travis.descriptor.json.in diff --git a/.travis.descriptor.json.in b/.travis.descriptor.json.in deleted file mode 100644 index fac2eee931..0000000000 --- a/.travis.descriptor.json.in +++ /dev/null @@ -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 -} diff --git a/.travis.yml b/.travis.yml index e429f4896c..66eafb6e03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,11 @@ script: "./.travis-build.sh" after_success: "./.travis-upload.sh" deploy: - provider: bintray - file: "${HOME}/build/${TRAVIS_REPO_SLUG}/.travis.descriptor.json" - user: citra-emu - key: - secure: "TqnAlO0AXxIsHGWcjEP2BVzSs26ErpGPRLMTShVfqaHBPCIfx1UtTcQltl5FVj3HdGKWjw3PgOui/XENVDTdYIwJZN0ziTwb59wcgC5agUmGZhaXMoWjBNxY5lEaSsKZfObgJRWUGaHUSS0KQo0Owlm1u4ORDwz7zagM3/hocKs=" + provider: releases + api_key: + secure: Mck15DIWaJdxDiS3aYVlM9N3G6y8VKUI1rnwII7/iolfm1s94U+tgvbheZDmT7SSbFyaGaYO/E8HrV/uZR9Vvs7ev20sHsTN1u60OTWfDIIyHs9SqjhcGbtq95m9/dMFschOYqTOR+gAs5BsxjuoeAotHdhpQEwvkO2oo5oR0zhGy45gjFnVvtcxT/IfpZBIpVgcK3aLb9zT6ekcJbSiPmEB15iLq3xXd0nFUNtEZdX3D6Veye4n5jB6n72qN8JVoKvPZAwaC2K0pZxpcGJaXDchLsw1q+4eCvdz6UJfUemeQ/uMAmjfeQ3wrzYGXe3nCM3WmX5wosCsB0mw4zYatzl3si6CZ1W+0GkV4Rwlx03dfp7v3EeFhTsXYCaXqhwuLZnWOLUik8t9vaSoFUx4nUIRwfO9kAMUJQSpLuHNO2nT01s3GxvqxzczuLQ9he5nGSi0RRodUzDwek1qUp6I4uV3gRHKz4B07YIc1i2fK88NLXjyQ0uLVZ+7Oq1+kgDp6+N7vvXXZ5qZ17tdaysSbKEE0Y8zsoXw7Rk1tPN19vrCS+TSpomNMyQyne1k+I5iZ/qkxPTLAS5qI6Utc2dL3GJdxWRAEfGNO9AIX3GV/jmmKfdcvwGsCYP8hxqs5vLYfgacw3D8NLf1941lQUwavC17jm9EV9g5G3Pn1Cp516E= + file_glob: true + file: "artifacts/*.tar.xz" + skip_cleanup: true + on: + tags: true \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index e232d99a41..52a1fd4924 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,11 +253,6 @@ get_git_head_revision(GIT_REF_SPEC GIT_REV) git_describe(GIT_DESC --always --long --dirty) 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") include_directories(${INI_PREFIX}) add_subdirectory(${INI_PREFIX}) diff --git a/appveyor.yml b/appveyor.yml index e4e1045def..d18bb1217e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -60,14 +60,11 @@ artifacts: type: zip deploy: -- provider: BinTray - username: citra-emu - api_key: - secure: qaZZfXp5Vv9xw5EmCxKLhGnNYhiNMDCdP84l0+h6HetfmvFlvHxyohWEVokLjl7d - subject: citra-emu - repo: citra - package: nightly - version: $(BINTRAY_VERSION) - publish: true + provider: GitHub + auth_token: + secure: "dbpsMC/MgPKWFNJCXpQl4cR8FYhepkPLjgNp/pRMktZ8oLKTqPYErfreaIxb/4P1" + artifact: msvcbuild + draft: false + prerelease: false on: branch: master