Skip to content

Run Java tests on Helix #18938

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 21 commits into from
Feb 19, 2020
Merged

Run Java tests on Helix #18938

merged 21 commits into from
Feb 19, 2020

Conversation

BrennanConroy
Copy link
Member

@BrennanConroy BrennanConroy commented Feb 10, 2020 •
edited
Loading

Part of #18799

@Pilchie Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Feb 11, 2020
BrennanConroy
BrennanConroy commented Feb 12, 2020
View reviewed changes
src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj
@@ -1,5 +1,5 @@
<Project DefaultTargets="Build">
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 project rename to have .Tests at the end is an unfortunate side-effect of how arcade determines if a project is a test or not, which we use when deciding how helix should behave.

@BrennanConroy BrennanConroy added the area-signalr Includes: SignalR clients and servers label Feb 12, 2020
@BrennanConroy BrennanConroy added this to the 5.0.0-preview1 milestone Feb 12, 2020
@BrennanConroy BrennanConroy marked this pull request as ready for review February 12, 2020 17:21
@BrennanConroy BrennanConroy requested a review from a team February 12, 2020 17:21
dougbu
dougbu reviewed Feb 12, 2020
View reviewed changes
eng/helix/content/InstallJdk.ps1
@@ -0,0 +1,62 @@
<#
Copy link
Contributor

Choose a reason for hiding this comment

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

Can the existing InstallJdk scripts from eng/scripts/ grow parameters to avoid duplicating them?

Copy link
Member Author

Choose a reason for hiding this comment

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

Unfortunately we need the script to be in this folder for helix, so either we duplicate the script, or use this one for everything

eng/targets/Helix.targets

<ItemGroup Condition="'$(TestDependsOnMssql)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true'">
<HelixPreCommand Include="call RunPowershell.cmd mssql\InstallSqlServerLocalDB.ps1 || exit /b 1" />
</ItemGroup>
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure but I bet this block can be removed. The on test project that sets $(TestDependsOnMssql) doesn't use SQL Server.

Copy link
Member Author

Choose a reason for hiding this comment

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

🤷‍♂ Unrelated to this change, this is just moved from the props file.

@analogrelay analogrelay merged commit e3a5f03 into master Feb 19, 2020
@analogrelay analogrelay deleted the brecon/javah branch February 19, 2020 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dougbu dougbu dougbu left review comments

@halter73 halter73 halter73 approved these changes

@analogrelay analogrelay Awaiting requested review from analogrelay

@jkotalik jkotalik Awaiting requested review from jkotalik

@Tratcher Tratcher Awaiting requested review from Tratcher

Assignees
No one assigned
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework area-signalr Includes: SignalR clients and servers
Projects
None yet
Milestone
5.0.0-preview2
Development

Successfully merging this pull request may close these issues.
5 participants
@BrennanConroy @halter73 @dougbu @analogrelay @Pilchie