From fbf19daff84a45931c848f45ddc447e92ad83d0b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 27 Dec 2018 04:36:32 -0500 Subject: [PATCH] fix: use correct name for packagecloud token when running CI commands --- contrib/copy-packages | 4 ++-- contrib/release | 2 +- contrib/release-dokku-update | 2 +- contrib/release-herokuish | 2 +- docs/development/release-process.md | 5 ++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/contrib/copy-packages b/contrib/copy-packages index 702c6cbe2..69282e35b 100644 --- a/contrib/copy-packages +++ b/contrib/copy-packages @@ -5,7 +5,7 @@ import shutil import subprocess from requests.auth import HTTPBasicAuth -PACKAGECLOUD_API_TOKEN = os.getenv('DOKKU_PACKAGECLOUD_API_TOKEN') +PACKAGECLOUD_TOKEN = os.getenv('DOKKU_PACKAGECLOUD_TOKEN') def download_file(filename, url): @@ -25,7 +25,7 @@ def upload_file(filename): def main(): - auth = HTTPBasicAuth(PACKAGECLOUD_API_TOKEN, '') + auth = HTTPBasicAuth(PACKAGECLOUD_TOKEN, '') base = requests.get('https://packagecloud.io/api/v1/repos/dokku/dokku/packages/deb/ubuntu/trusty.json', auth=auth) data = base.json() diff --git a/contrib/release b/contrib/release index 100e351d1..4e87d9adf 100755 --- a/contrib/release +++ b/contrib/release @@ -332,7 +332,7 @@ main() { fn-require-bin "docker" fn-require-bin "git" fn-require-bin "package_cloud" - [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable" + [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" CURRENT_VERSION="$(fn-version-current)" NEXT_VERSION="$(fn-version-next "$CURRENT_VERSION" "$RELEASE")" diff --git a/contrib/release-dokku-update b/contrib/release-dokku-update index 740524dc1..6e6becfd7 100755 --- a/contrib/release-dokku-update +++ b/contrib/release-dokku-update @@ -139,7 +139,7 @@ main() { fn-require-bin "docker" fn-require-bin "package_cloud" - [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable" + [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" NEXT_VERSION="$(grep DOKKU_UPDATE_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)" IS_RELEASE="$(fn-is-release "$RELEASE")" diff --git a/contrib/release-herokuish b/contrib/release-herokuish index e6f4bbe03..fd921857c 100755 --- a/contrib/release-herokuish +++ b/contrib/release-herokuish @@ -139,7 +139,7 @@ main() { fn-require-bin "docker" fn-require-bin "package_cloud" - [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable" + [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" NEXT_VERSION="$(grep HEROKUISH_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)" IS_RELEASE="$(fn-is-release "$RELEASE")" diff --git a/docs/development/release-process.md b/docs/development/release-process.md index 9409b3d5f..eec77d74b 100644 --- a/docs/development/release-process.md +++ b/docs/development/release-process.md @@ -5,13 +5,12 @@ Dokku is released in intervals *at most* three weeks apart, though may be releas To propose a release, the following tasks need to be performed: ```shell -export PACKAGECLOUD_API_TOKEN=SOME_TOKEN +export PACKAGECLOUD_TOKEN=SOME_TOKEN # supports major/minor/patch/betafish contrib/release ``` -> If you are a maintainer and need the PACKAGECLOUD_API_TOKEN in order to make a release, please contact @josegonzalez to get this information. - +> If you are a maintainer and need the PACKAGECLOUD_TOKEN in order to make a release, please contact @josegonzalez to get this information. As well, the ArchLinux package description *must* be updated via `vagrant up build-arch` (needs to be done after the tag is pushed to GitHub, because it is based on that)