Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Native support for multi-module Maven projects #1970

Merged
merged 1 commit into from Apr 18, 2023

Conversation

basil
Copy link
Member

@basil basil commented Apr 17, 2023

@@ -9,7 +9,7 @@
<artifactId>bom-weekly</artifactId>
<packaging>pom</packaging>
<properties>
<aws-java-sdk-plugin.version>1.12.406-378.v938a_d577f750</aws-java-sdk-plugin.version>
<aws-java-sdk-plugin.version>1.12.447-382.vda_68e2007233</aws-java-sdk-plugin.version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment on lines -16 to -17
LINE=$LINE bash prep-megawar.sh
bash prep-pct.sh
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now done in prep.sh itself, so no need to run these beforehand.

@@ -15,6 +15,7 @@ fi

exec java \
-jar target/pct.jar \
test-plugins \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The upstream PCT JAR now has two modes: list-plugins (to divide the list by repository) and test-plugins (the old mode).

pushd sample-plugin/target/test-classes/test-dependencies
ls -1 *.hpi | sed s/.hpi//g >../../../../target/plugins.txt
popd
bash prep-pct.sh
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed for list-plugins a few lines below.

ls -1 *.hpi | sed s/.hpi//g >../../../../target/plugins.txt
popd
bash prep-pct.sh
LINE=$LINE bash prep-megawar.sh
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed for list-plugins on the next line.

if [[ ${LINE} != weekly ]]; then
LINE=$LINE bash prep-megawar.sh
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we've already built the megawar for the weekly a few lines above, we don't need to do it again here. So move this into the conditional to avoid unnecessary duplication of work.

@basil
Copy link
Member Author

basil commented Apr 18, 2023

While two branches timed out due to infrastructure failures, I have previously gotten a successful build of those two branches with an earlier draft version of this PR, so I do not think we ought to be concerned about them.

From my perspective this is ready for merge.

@MarkEWaite MarkEWaite merged commit 91eed1b into jenkinsci:master Apr 18, 2023
468 of 469 checks passed
@jglick jglick added the chore Reduces future maintenance label Apr 21, 2023
@jglick jglick mentioned this pull request Apr 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Reduces future maintenance
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants