Merge pull request #6604 from ulyssessouza/fix-release-resources

Fix release resources
This commit is contained in:
Ulysses Souza 2019-03-22 11:52:36 +01:00 committed by GitHub
commit fc757fb4f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -40,7 +40,7 @@ This API token should be exposed to the release script through the
### A Bintray account and Bintray API key ### A Bintray account and Bintray API key
Your Bintray account will need to be an admin member of the Your Bintray account will need to be an admin member of the
[docker-compose organization](https://github.com/settings/tokens). [docker-compose organization](https://bintray.com/docker-compose).
Additionally, you should generate a personal API key. To do so, click your Additionally, you should generate a personal API key. To do so, click your
username in the top-right hand corner and select "Edit profile" ; on the new username in the top-right hand corner and select "Edit profile" ; on the new
page, select "API key" in the left-side menu. page, select "API key" in the left-side menu.
@ -129,7 +129,7 @@ assets public), proceed to the "Finalize a release" section of this guide.
Once you're ready to make your release public, you may execute the following Once you're ready to make your release public, you may execute the following
command from the root of the Compose repository: command from the root of the Compose repository:
``` ```
./script/release/release.sh -b <BINTRAY_USERNAME> finalize RELEAE_VERSION ./script/release/release.sh -b <BINTRAY_USERNAME> finalize RELEASE_VERSION
``` ```
Note that this command will create and publish versioned assets to the public. Note that this command will create and publish versioned assets to the public.

View File

@ -7,7 +7,6 @@ import os
import shutil import shutil
import sys import sys
import time import time
from distutils.core import run_setup
from jinja2 import Template from jinja2 import Template
from release.bintray import BintrayAPI from release.bintray import BintrayAPI
@ -276,7 +275,8 @@ def finalize(args):
repository.checkout_branch(br_name) repository.checkout_branch(br_name)
run_setup(os.path.join(REPO_ROOT, 'setup.py'), script_args=['sdist', 'bdist_wheel']) os.system('python {setup_script} sdist bdist_wheel'.format(
setup_script=os.path.join(REPO_ROOT, 'setup.py')))
merge_status = pr_data.merge() merge_status = pr_data.merge()
if not merge_status.merged and not args.finalize_resume: if not merge_status.merged and not args.finalize_resume: