From e616760479b62605f56e87367efd0adedc78e67a Mon Sep 17 00:00:00 2001 From: zhengzhoumin Date: Thu, 28 Jun 2018 13:27:08 +0800 Subject: [PATCH 1/3] change ci address to my own --- bin/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/upgrade b/bin/upgrade index 9a595cf977..a9f7a4e278 100755 --- a/bin/upgrade +++ b/bin/upgrade @@ -75,7 +75,7 @@ class Release(namedtuple('Release', ('version', 'download_url', 'filename', 'des def get_latest_release_from_ci(): - response = requests.get('https://circleci.com/api/v1.1/project/github/getredash/redash/latest/artifacts?branch=master') + response = requests.get('https://circleci.com/api/v1.1/project/github/getredash/redash/latest/artifacts?branch=master&circle-token=0d516e8e705fe3918008781b7596b4b7d8c243aa') if response.status_code != 200: exit("Failed getting releases (status code: %s)." % response.status_code) @@ -84,7 +84,7 @@ def get_latest_release_from_ci(): filename = urllib.unquote(tarball_asset['pretty_path'].split('/')[-1]) version = filename.replace('redash.', '').replace('.tar.gz', '') - release = Release(version, tarball_asset['url'], filename, '') + release = Release(version, tarball_asset['url']+'?circle-token=0d516e8e705fe3918008781b7596b4b7d8c243aa', filename, '') return release From 21b7b75de28f11fc1556185564652e3f395cbdb8 Mon Sep 17 00:00:00 2001 From: zhengzhoumin Date: Thu, 28 Jun 2018 13:49:50 +0800 Subject: [PATCH 2/3] forgot to change circleci username in the artifacts url --- bin/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/upgrade b/bin/upgrade index a9f7a4e278..0a45a6417d 100755 --- a/bin/upgrade +++ b/bin/upgrade @@ -75,7 +75,7 @@ class Release(namedtuple('Release', ('version', 'download_url', 'filename', 'des def get_latest_release_from_ci(): - response = requests.get('https://circleci.com/api/v1.1/project/github/getredash/redash/latest/artifacts?branch=master&circle-token=0d516e8e705fe3918008781b7596b4b7d8c243aa') + response = requests.get('https://circleci.com/api/v1.1/project/github/harmy/redash/latest/artifacts?branch=master&circle-token=0d516e8e705fe3918008781b7596b4b7d8c243aa') if response.status_code != 200: exit("Failed getting releases (status code: %s)." % response.status_code) From 5bad35d409485f450831dcd57a315bd0c067d563 Mon Sep 17 00:00:00 2001 From: zhengzhoumin Date: Thu, 28 Jun 2018 13:54:46 +0800 Subject: [PATCH 3/3] code refactoring --- bin/upgrade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/upgrade b/bin/upgrade index 0a45a6417d..a3092f4dc3 100755 --- a/bin/upgrade +++ b/bin/upgrade @@ -83,8 +83,9 @@ def get_latest_release_from_ci(): tarball_asset = filter(lambda asset: asset['url'].endswith('.tar.gz'), response.json())[0] filename = urllib.unquote(tarball_asset['pretty_path'].split('/')[-1]) version = filename.replace('redash.', '').replace('.tar.gz', '') - - release = Release(version, tarball_asset['url']+'?circle-token=0d516e8e705fe3918008781b7596b4b7d8c243aa', filename, '') + tarball_asset['url'] += '?circle-token=0d516e8e705fe3918008781b7596b4b7d8c243aa' + + release = Release(version, tarball_asset['url'], filename, '') return release