On 1 April 2018 at 14:03, John D. Ament <johndam...@apache.org> wrote: > From reading through this, I think I understand the confusion faced. > > Typically when we see a source release, its tied to a single git repo. > Generating the source release in this case involves a special type of git > checkout, which IMHO is just fine. > > It just needs to be documented that when you clone the repo, it's using the > --recurse-submodules flag. This should result in > > Cloning into 'incubator-skywalking'... > remote: Counting objects: 114594, done. > remote: Compressing objects: 100% (38/38), done. > remote: Total 114594 (delta 10), reused 29 (delta 2), pack-reused 114539 > Receiving objects: 100% (114594/114594), 134.38 MiB | 4.55 MiB/s, done. > Resolving deltas: 100% (44254/44254), done. > Submodule 'apm-protocol/apm-network/src/main/proto' ( > https://github.com/apache/incubator-skywalking-data-collect-protocol.git) > registered for path 'apm-protocol/apm-network/src/main/proto' > Submodule 'skywalking-ui' (https://github.com/apache/incubator-skywalking-ui) > registered for path 'skywalking-ui' > Cloning into > '/Users/johnament/src/apache/incubator-skywalking/apm-protocol/apm-network/src/main/proto'... > remote: Counting objects: 52, done. > remote: Compressing objects: 100% (44/44), done. > remote: Total 52 (delta 34), reused 10 (delta 8), pack-reused 0 > Cloning into > '/Users/johnament/src/apache/incubator-skywalking/skywalking-ui'... > remote: Counting objects: 4374, done. > remote: Compressing objects: 100% (84/84), done. > remote: Total 4374 (delta 38), reused 51 (delta 17), pack-reused 4268 > > Receiving objects: 100% (4374/4374), 3.56 MiB | 6.15 MiB/s, done. > Resolving deltas: 100% (2107/2107), done. > Submodule path 'apm-protocol/apm-network/src/main/proto': checked out > 'c02c12af12116121e25155d1f3fca0fadee5f2e9' > Submodule path 'skywalking-ui': checked out > '922c012efd0c385e3c502d06d2730c73452f779d' > > > and then the checks that Sebb is trying should work. > > Sheng, do you know if this checkout is documented somewhere?
Also, when GitHub is used to grab the code as a Zip, it does not include the submodules. Maybe there is a setting that can tell GitHub to adjust the Zip contents as well. > John > > On Sun, Apr 1, 2018 at 8:49 AM sebb <seb...@gmail.com> wrote: > >> On 1 April 2018 at 01:43, 吴晟 Sheng Wu <wu.sh...@foxmail.com> wrote: >> > Hi sebb, >> > >> > >> > I see your point, that is why we provide the build document[1] if you >> want to build from GitHub tag. Git submodules are used in our project for >> binding multi repos. The source codes tar is provided by running some >> source code release process, by following project document[2] and script >> [3]. >> >> I see. >> So cloning the Git repo is not sufficient to get all the code (unless >> there is an option to automatically include submodules that I have >> missed). >> >> > >> > And for `dependency-reduced-pom.xml`, it is generated in building the >> project, when we run build and tar source code. If you think we should not >> include it, I think we can add an exclusion in next release. >> >> That would be a good idea. >> >> > >> > Is that good enough for you? >> >> I think there is a problem with the build process, because the source >> artifact contains other items that are not in Git. >> >> $ diff -r incubator-skywalking/ >> apache-skywalking-apm-incubating-5.0.0-alpha >> Only in incubator-skywalking/: .git >> Only in incubator-skywalking/: .github >> Only in incubator-skywalking/: .gitignore >> Only in incubator-skywalking/: .travis.yml >> Only in incubator-skywalking/apm-protocol/apm-network/src/main/proto: .git >> Only in apache-skywalking-apm-incubating-5.0.0-alpha/apm-sniffer/apm-agent: >> dependency-reduced-pom.xml >> Only in >> apache-skywalking-apm-incubating-5.0.0-alpha/apm-sniffer/apm-agent-core: >> dependency-reduced-pom.xml >> Only in >> apache-skywalking-apm-incubating-5.0.0-alpha/apm-sniffer/apm-agent-core: >> file: >> Only in >> apache-skywalking-apm-incubating-5.0.0-alpha/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation: >> dependency-reduced-pom.xml >> Only in incubator-skywalking/: docs >> Only in incubator-skywalking/skywalking-ui: .git >> Only in incubator-skywalking/skywalking-ui: .gitignore >> Only in incubator-skywalking/skywalking-ui: .travis.yml >> Only in apache-skywalking-apm-incubating-5.0.0-alpha/skywalking-ui: etc >> Only in incubator-skywalking/: tools >> >> In the above listing, incubator-skywalking is the git clone produced by: >> $ git clone --depth 1 >> https://github.com/apache/incubator-skywalking.git -b v5.0.0-alpha >> $ cd incubator-skywalking >> $ git submodule init >> $ git submodule update >> and apache-skywalking-apm-incubating-5.0.0-alpha is the unpacked >> version of apache-skywalking-apm-incubating-5.0.0-alpha-src.tgz >> >> The files that are only in Git are generally OK. >> >> However there should not generally be any files in the source archive >> that are not also in Git. >> >> Apart from the poms, there are two such directories: >> >> apm-sniffer/apm-agent-core/file: >> skywalking-ui/etc >> >> The latter is empty. >> However the former contains quite a few directories which look to be >> crud from the build process. >> >> > >> > [1] >> https://github.com/apache/incubator-skywalking/blob/v5.0.0-alpha/docs/en/How-to-build.md#build-from-github >> > [2] >> https://github.com/apache/incubator-skywalking/blob/v5.0.0-alpha/docs/en/How-to-release.md#build-and-sign-the-source-code-package >> > [3] >> https://github.com/apache/incubator-skywalking/blob/v5.0.0-alpha/tools/releasing/create_source_release.sh >> > >> > >> > ------------------ >> > Sheng Wu >> > Apache SkyWalking original creator and PPMC member >> > >> > >> > >> > >> > >> > >> > >> > ------------------ Original ------------------ >> > From: "sebb"<seb...@gmail.com>; >> > Date: Sun, Apr 1, 2018 08:28 AM >> > To: "general"<general@incubator.apache.org>; >> > >> > Subject: Re: [VOTE] Release Apache SkyWalking (incubating) >> version5.0.0-alpha(3rd round) >> > >> > >> > >> > On 1 April 2018 at 00:53, 吴晟 Sheng Wu <wu.sh...@foxmail.com> wrote: >> >>> Please include the SCM URL in the VOTE email, as the tag and commitId >> >>> aren't much use without it. >> >> >> >> >> >> >> >> Hi Sebb >> >> >> >> >> >> The SCM url with tag is this : >> https://github.com/apache/incubator-skywalking/tree/v5.0.0-alpha >> >> >> >> >> >> Thanks. >> > >> > I see. >> > >> > However that does not actually have a tag with the name '5.0.0-alpha' >> > >> > Also, when I compare the contents of >> > apache-skywalking-apm-incubating-5.0.0-alpha-src.tgz with the tag, >> > there are several files in the source release that don't appear to >> > have a counterpart in the Git repo. >> > >> > For example, apm-sniffer/apm-agent/dependency-reduced-pom.xml >> > >> > skywalking-ui/* >> > >> > That does not seem right >> > >> >> >> >> ------------------ >> >> Sheng Wu >> >> Apache SkyWalking original creator and PPMC member >> >> >> >> >> >> >> >> >> >> >> >> >> >> >> >> ------------------ Original ------------------ >> >> From: "sebb"<seb...@gmail.com>; >> >> Date: Sun, Apr 1, 2018 07:41 AM >> >> To: "general"<general@incubator.apache.org>; >> >> >> >> Subject: Re: [VOTE] Release Apache SkyWalking (incubating) version >> 5.0.0-alpha(3rd round) >> >> >> >> >> >> >> >> On 31 March 2018 at 05:07, 吴晟 Sheng Wu <wu.sh...@foxmail.com> wrote: >> >>> Hi All, >> >>> This is a call for vote to release Apache SkyWalking (Incubating) >> version 5.0.0-alpha. >> >>> >> >>> >> >>> The Apache SkyWalking community has tested, voted and approved the >> proposed >> >>> release of Apache SkyWalking (Incubating) 5.0.0-alpha >> >>> >> >>> >> >>> From last vote: >> >>> 1. Separated the NOTICE and LICENSE in source package and distribution >> >>> 2. Removed the libraries in source package. >> >>> 3. Removed some unnecessary excludes from rat setting. >> >>> 4. Added a missing DISCLAIMER file. >> >>> >> >>> >> >>> We now kindly request the Incubator PMC members review and vote on this >> >>> incubator release. >> >>> >> >>> >> >>> Skywalking is an APM (application performance monitor), especially for >> microservice, Cloud Native and container-based architecture systems. >> >>> Also known as a distributed tracing system. >> >>> It provides an automatic way to instrument applications: >> >>> no need to change any of the source code of the target application; >> >>> and an collector with an very high efficiency streaming module. >> >>> >> >>> >> >>> Vote Thread: >> >>> >> >>> >> >>> * >> https://lists.apache.org/thread.html/4459517d990e2d0fa879ced5b65c44e047191e8b9301e8b6d67f7927@%3Cdev.skywalking.apache.org%3E >> >>> >> >>> >> >>> Result Thread: >> >>> >> >>> >> >>> * >> https://lists.apache.org/thread.html/c55adf4fa19d6c9ffa76a8d0cf246590d95d8dd7dead11331346e10b@%3Cdev.skywalking.apache.org%3E >> >>> >> >>> >> >>> Release notes: >> >>> >> >>> >> >>> * >> https://github.com/apache/incubator-skywalking/blob/v5.0.0-alpha/CHANGES.md >> >>> >> >>> >> >>> Release Candidate: >> >>> >> >>> >> >>> * >> https://dist.apache.org/repos/dist/dev/incubator/skywalking/5.0.0-alpha/ >> >>> >> >>> >> >>> Maven 2 staging repository: >> >>> >> >>> >> >>> * >> https://repository.apache.org/content/repositories/orgapacheskywalking-1010/org/apache/skywalking/ >> >>> >> >>> >> >>> Release Tag : >> >>> >> >>> >> >>> * 5.0.0-alpha >> >>> >> >>> >> >>> Release CommitID : >> >>> >> >>> >> >>> * 476ae378bed24690628cc0d16108185b7b5580b6 >> >> >> >> Please include the SCM URL in the VOTE email, as the tag and commitId >> >> aren't much use without it. >> >> >> >> The URL would help both for the vote checked and for the historical >> records. >> >> >> >>> >> >>> Keys to verify the Release Candidate : >> >>> >> >>> >> >>> * http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x2EF5026E70A55777 >> >>> * >> https://dist.apache.org/repos/dist/dev/incubator/skywalking/5.0.0-alpha/KEYS >> >>> >> >>> >> >>> corresponding to pen...@apache.org >> >>> >> >>> >> >>> Guide to build the release from source : >> >>> >> >>> >> >>> * >> https://github.com/apache/incubator-skywalking/blob/v5.0.0-alpha/docs/en/How-to-build.md#build-from-apache-source-codes >> >>> >> >>> >> >>> Voting will start now (March 31th) and will remain open for at least >> 72 hours, Request IPMC to give their vote. >> >>> [ ] +1 Release this package. >> >>> [ ] +0 No opinion. >> >>> [ ] -1 Do not release this package because.... >> >>> >> >>> >> >>> >> >>> ------------------ >> >>> Sheng Wu >> >>> Apache SkyWalking original creator and PPMC member >> >> >> >> --------------------------------------------------------------------- >> >> To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org >> >> For additional commands, e-mail: general-h...@incubator.apache.org >> > >> > --------------------------------------------------------------------- >> > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org >> > For additional commands, e-mail: general-h...@incubator.apache.org >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org >> For additional commands, e-mail: general-h...@incubator.apache.org >> >> --------------------------------------------------------------------- To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org For additional commands, e-mail: general-h...@incubator.apache.org
