You are viewing a plain text version of this content. The canonical link for it is here.
Posted to proton@qpid.apache.org by dnwe <gi...@git.apache.org> on 2015/05/06 13:07:14 UTC
[GitHub] qpid-proton pull request: NO-JIRA: improvements to export.sh
GitHub user dnwe opened a pull request:
https://github.com/apache/qpid-proton/pull/28
NO-JIRA: improvements to export.sh
+ allow specific tag to be specified as cmdline arg
+ confirm the tag exists before proceeding
+ use the version.txt from that tag as the tar prefix folder
+ re-run the version.sh script before packaging to ensure the correct
version is set
+ add .gitattributes to exclude .gitignore files from the exported tar
Closes #28
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/dnwe/qpid-proton fix-export-script
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/qpid-proton/pull/28.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #28
----
commit a90e2b1c04dd8a03d240b83ed9b67c3f7611a66c
Author: Dominic Evans <do...@uk.ibm.com>
Date: 2015-05-06T11:03:58Z
NO-JIRA: improvements to export.sh
+ allow specific tag to be specified as cmdline arg
+ confirm the tag exists before proceeding
+ use the version.txt from that tag as the tar prefix folder
+ re-run the version.sh script before packaging to ensure the correct
version is set
+ add .gitattributes to exclude .gitignore files from the exported tar
Closes #28
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] qpid-proton pull request: NO-JIRA: improvements to export.sh
Posted by rhs <gi...@git.apache.org>.
Github user rhs commented on a diff in the pull request:
https://github.com/apache/qpid-proton/pull/28#discussion_r29751867
--- Diff: bin/export.sh ---
@@ -54,15 +65,18 @@ WORKDIR=$(mktemp -d)
##
(
cd ${SRC}
- TAG=$(git describe --tags --always)
MTIME=$(date -d @`git log -1 --pretty=format:%ct tags/${TAG}` '+%Y-%m-%d %H:%M:%S')
ARCHIVE=$DIR/qpid-proton-${TAG}.tar.gz
+ VERSION=$(git show tags/${TAG}:version.txt)
+ PREFIX=qpid-proton-${VERSION}
[ -d ${WORKDIR} ] || mkdir -p ${WORKDIR}
- git archive --format=tar --prefix=qpid-proton-${TAG}/ tags/${TAG} \
+ git archive --format=tar --prefix=${PREFIX}/ tags/${TAG} \
| tar -x -C ${WORKDIR}
+ ${SRC}/bin/version.sh ${WORKDIR}/${PREFIX} ${VERSION}
--- End diff --
This doesn't make sense to me. This script is supposed to simply export exactly the contents of a tag in the git repo. This tag is generally a signed release, and running scripts over the content of the release will invalidate that process entirely.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] qpid-proton pull request: NO-JIRA: improvements to export.sh
Posted by rhs <gi...@git.apache.org>.
Github user rhs commented on the pull request:
https://github.com/apache/qpid-proton/pull/28#issuecomment-99428883
Fixing the prefix in the tarball makes sense to me, however some of the other changes do not. The release process is supposed to proceed from a signed tag, which means that if the version for that signed tag is wrong, then something prior in the process has gone wrong.
In general having export.sh modify the contents of the exported source tree in any way is dangerous since it will lead to divergence between the contents of the git tag for a given release and the contents of the exported tarballs for that release, and that is obviously really bad.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] qpid-proton pull request: NO-JIRA: improvements to export.sh
Posted by dnwe <gi...@git.apache.org>.
Github user dnwe commented on the pull request:
https://github.com/apache/qpid-proton/pull/28#issuecomment-99431533
Removed by 81c2110
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] qpid-proton pull request: NO-JIRA: improvements to export.sh
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/qpid-proton/pull/28
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] qpid-proton pull request: NO-JIRA: improvements to export.sh
Posted by gemmellr <gi...@git.apache.org>.
Github user gemmellr commented on the pull request:
https://github.com/apache/qpid-proton/pull/28#issuecomment-99423851
A little more info:most of the changes are to ensure the dir within the tar matches the version, in case the tag name does not (e.g a proposed final RC being voted on).
Looks good to me.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] qpid-proton pull request: NO-JIRA: improvements to export.sh
Posted by dnwe <gi...@git.apache.org>.
Github user dnwe commented on the pull request:
https://github.com/apache/qpid-proton/pull/28#issuecomment-99430067
@rhs the only reason for the re-run of the version.sh was for re-creating the .tar.gz for older proton releases <= 0.8 which were tagged in the repository without the version tags having been properly set
i.e. if you ran export.sh for 0.8 you actually get 1.0-SNAPSHOT in the pom.xml
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---