Merge pull request #3348 from dokku/packagecloud-token

Use correct name for packagecloud token when running CI commands
This commit is contained in:
Jose Diaz-Gonzalez
2018-12-27 08:35:07 -05:00
committed by GitHub
5 changed files with 7 additions and 8 deletions

View File

@@ -5,7 +5,7 @@ import shutil
import subprocess import subprocess
from requests.auth import HTTPBasicAuth 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): def download_file(filename, url):
@@ -25,7 +25,7 @@ def upload_file(filename):
def main(): 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', base = requests.get('https://packagecloud.io/api/v1/repos/dokku/dokku/packages/deb/ubuntu/trusty.json',
auth=auth) auth=auth)
data = base.json() data = base.json()

View File

@@ -332,7 +332,7 @@ main() {
fn-require-bin "docker" fn-require-bin "docker"
fn-require-bin "git" fn-require-bin "git"
fn-require-bin "package_cloud" 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)" CURRENT_VERSION="$(fn-version-current)"
NEXT_VERSION="$(fn-version-next "$CURRENT_VERSION" "$RELEASE")" NEXT_VERSION="$(fn-version-next "$CURRENT_VERSION" "$RELEASE")"

View File

@@ -139,7 +139,7 @@ main() {
fn-require-bin "docker" fn-require-bin "docker"
fn-require-bin "package_cloud" 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)" NEXT_VERSION="$(grep DOKKU_UPDATE_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)"
IS_RELEASE="$(fn-is-release "$RELEASE")" IS_RELEASE="$(fn-is-release "$RELEASE")"

View File

@@ -139,7 +139,7 @@ main() {
fn-require-bin "docker" fn-require-bin "docker"
fn-require-bin "package_cloud" 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)" NEXT_VERSION="$(grep HEROKUISH_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)"
IS_RELEASE="$(fn-is-release "$RELEASE")" IS_RELEASE="$(fn-is-release "$RELEASE")"

View File

@@ -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: To propose a release, the following tasks need to be performed:
```shell ```shell
export PACKAGECLOUD_API_TOKEN=SOME_TOKEN export PACKAGECLOUD_TOKEN=SOME_TOKEN
# supports major/minor/patch/betafish # supports major/minor/patch/betafish
contrib/release 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) 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)