Repository navigation
Let common-ci set the versions, find the bundle and collect the unit test reports - #78
Draft
ben51degrees wants to merge 1 commit into
Draft
ben51degrees wants to merge 1 commit into
ben51degrees wants to merge 1 commit into
Conversation
…test reports common-ci's release of 3 November takes a list of folders to set the version in, finds the Central publishing bundle under any module, and collects Surefire reports from modules at any depth. The versions:set loop and the link at target/central-publishing in ci/build-package.ps1 go, and ci/run-unit-tests.ps1 calls common-ci's helper instead of copying it. ci/copy-test-results.ps1 stays for the integration and performance tests, which make several Maven runs that report into one folder. Its comment now says so.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The problem
When this repository was put together, common-ci's Java scripts were written for one package tree with its root
pom.xmlas the parent of every module. Three things inci/worked around that:ci/build-package.ps1ranmvn versions:setitself in each of the six trees, because common-ci set the version at the root only, where nothing reaches the trees.ci/build-package.ps1made a link attarget/central-publishingto the first publishing tree's bundle, because common-ci copied the bundle from below the root only.ci/copy-test-results.ps1collected the Surefire reports of modules at any depth, because common-ci looked one folder down only.common-ci's release of 3 November (common-ci#290) took in the changes that make these unnecessary: #280 gives
java/build-package.ps1aVersionPathslist, #274 makes it find the one bundle under any module, and #278 makes the three Java test helpers collect reports from any depth. Every workflow here runs common-ci frommain, so this repository has had the fixes since then and kept the workarounds.What changes
ci/build-package.ps1passes the six trees fromci/packages.ps1as-VersionPathsand lets common-ci set the version. The link is gone. common-ci'sversions:setleavespom.xml.versionsBackupfiles behind, as it did for the separate repositories before the move. They are in a checkout the job throws away and nothing reads them.ci/run-unit-tests.ps1calls common-ci'sjava/run-unit-tests.ps1, which is what the script here had copied: one Surefire run from the root, the reports of every module copied intotest-results/unitwithout the example tests, and the JVM crash collector when the run fails. The four Maven arguments it passed before, thedevprofile and the three keys, go through-ExtraArgs. The guard for a common-ci branch without the collector is gone, becausemainhas it.ci/README.mdsays common-ci sets the version in each tree.What stays
ci/copy-test-results.ps1stays forci/run-integration-tests.ps1andci/run-performance-tests.ps1. common-ci's helpers copy the reports of the one Maven run they make. Those two scripts make several runs, one inpipelineand one in each examples tree against the version the publish built, and each run reports into the same folder, so they copy the reports themselves. The script's comment now gives that reason rather than the depth limit, which is fixed.Overlap with #63
#63 rewrites
ci/build-package.ps1for a version per package and removes the same loop and link. Whichever merges second has a conflict in that file, and the resolution is to take #63's version of it. The other three files here are not touched by #63.How it was checked
java/run-unit-tests.ps1andjava/build-package.ps1that print what they are given, against a checkout of this repository. The unit test script passed-Pdev,-DTestResourceKey,-DSuperResourceKeyand-DLicenseKeyand returned the stand-in's exit code. The package build passed the six tree folders asVersionPaths, and its-plexclusion of the examples was unchanged.ci/run-unit-tests.ps1for real.ci/build-package.ps1runs in the publish workflow only, so a publish dry run is the check for it.