1 |
Am 05.01.2014 16:50, schrieb Mike Frysinger: |
2 |
> This automates the release+test cycle a bit so people don't have to do |
3 |
> it all by hand. |
4 |
> --- |
5 |
> DEVELOPING | 7 ++----- |
6 |
> mkrelease.sh | 15 +++++++++++++-- |
7 |
> 2 files changed, 15 insertions(+), 7 deletions(-) |
8 |
> |
9 |
> diff --git a/DEVELOPING b/DEVELOPING |
10 |
> index 7aac81b..b704a50 100644 |
11 |
> --- a/DEVELOPING |
12 |
> +++ b/DEVELOPING |
13 |
> @@ -167,11 +167,8 @@ Releases |
14 |
> First create a git tag for this release: |
15 |
> git tag v2.2.8 |
16 |
> |
17 |
> -Then create the tarball: |
18 |
> - ./mkrelease.sh --changelog-rev v2.2.7 --tag 2.2.8 |
19 |
> - |
20 |
> -Unpack the tarball and run tests: |
21 |
> - ./runtests.sh --python-versions=supported |
22 |
> +Then create the tarball and run the tests: |
23 |
> + ./mkrelease.sh --changelog-rev v2.2.7 --tag --runtests 2.2.8 |
24 |
|
25 |
Shouldn't this be: |
26 |
./mkrelease.sh --changelog-rev v2.2.7 --tag 2.2.8 --runtests 2.2.8 |
27 |
? |
28 |
|
29 |
> Make sure you have all supported python versions installed first |
30 |
> (see PYTHON_SUPPORTED_VERSIONS in runtests.sh). |
31 |
> |
32 |
> diff --git a/mkrelease.sh b/mkrelease.sh |
33 |
> index 50bdb3c..334b4fb 100755 |
34 |
> --- a/mkrelease.sh |
35 |
> +++ b/mkrelease.sh |
36 |
> @@ -8,9 +8,10 @@ BRANCH=${BRANCH:-master} |
37 |
> USE_TAG=false |
38 |
> CHANGELOG_REVISION= |
39 |
> UPLOAD_LOCATION= |
40 |
> +RUNTESTS=false |
41 |
> |
42 |
> usage() { |
43 |
> - echo "Usage: ${0##*/} [--changelog-rev <tree-ish>] [-t|--tag] [-u|--upload <location>] <version>" |
44 |
> + echo "Usage: ${0##*/} [--changelog-rev <tree-ish>] [-t|--tag] [-u|--upload <location>] [--runtests] <version>" |
45 |
> exit ${1:-0} |
46 |
> } |
47 |
> |
48 |
> @@ -19,7 +20,7 @@ die() { |
49 |
> usage 1 |
50 |
> } |
51 |
> |
52 |
> -ARGS=$(getopt -o htu: --long help,changelog-rev:,tag,upload: \ |
53 |
> +ARGS=$(getopt -o htu: --long help,changelog-rev:,runtests,tag,upload: \ |
54 |
> -n "${0##*/}" -- "$@") |
55 |
> [ $? != 0 ] && die "initialization error" |
56 |
> |
57 |
> @@ -42,6 +43,10 @@ while true; do |
58 |
> -h|--help) |
59 |
> usage |
60 |
> ;; |
61 |
> + --runtests) |
62 |
> + RUNTESTS=true |
63 |
> + shift |
64 |
> + ;; |
65 |
> --) |
66 |
> shift |
67 |
> break |
68 |
> @@ -78,6 +83,12 @@ cp -a "${SOURCE_DIR}/"{bin,cnf,doc,man,misc,pym} "${RELEASE_DIR}/" || die "direc |
69 |
> cp "${SOURCE_DIR}/"{DEVELOPING,LICENSE,Makefile,NEWS,README,RELEASE-NOTES,TEST-NOTES} \ |
70 |
> "${RELEASE_DIR}/" || die "file copy failed" |
71 |
> |
72 |
> +if [[ ${RUNTESTS} == "true" ]] ; then |
73 |
> + pushd "${SOURCE_DIR}" >/dev/null |
74 |
> + ./runtests.sh --python-versions=supported || die "tests failed" |
75 |
> + popd >/dev/null |
76 |
> +fi |
77 |
> + |
78 |
> rm -rf "${SOURCE_DIR}" || die "directory cleanup failed" |
79 |
> |
80 |
> echo ">>> Setting portage.VERSION" |
81 |
> |