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

fix jcasc test harness #39

Merged
merged 3 commits into from
Jan 14, 2020
Merged

fix jcasc test harness #39

merged 3 commits into from
Jan 14, 2020

Conversation

jetersen
Copy link
Member

@jetersen jetersen commented Jan 13, 2020

JCasc had to create a new dependency that wasn't a tests classifier because maven doesn't allow you to bring dependencies through classifiers.

Upgrading here so that PCT works again,

Tracking:
jenkinsci/bom#164

Note: We'll need a release for PCT please

@jglick
Copy link
Member

jglick commented Jan 13, 2020

Please git merge origin/master so this shows the diff only past #38.

@jglick jglick self-requested a review January 13, 2020 19:15
Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

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

Assuming tests pass.

By the way if one PR (of yours, or someone else’s) is required for a PR you file, simply cut your branch from that commit (or, retroactively, merge it into your own branch). So long as you avoid destructive history operations, GitHub is smart enough to treat the first (subsumed) PR as merged if and when the second (subsuming) PR is merged: it suffices for a PR branch head to be ancestor of the PR’s base branch.

@jglick jglick merged commit f650e50 into jenkinsci:master Jan 14, 2020
@jetersen jetersen deleted the fix/jcasc-test-harness branch January 14, 2020 14:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants