Use MacOS-13 in CI #58465
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,62 @@ | ||
| plugins { | ||
| id 'java' | ||
| id 'maven-publish' | ||
| } | ||
|
|
||
| group 'com.microsoft.signalr.messagepack' | ||
|
|
||
| java | ||
| { | ||
| withJavadocJar() | ||
| withSourcesJar() | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation project(':core') | ||
| implementation 'org.msgpack:msgpack-core:0.8.20' | ||
| implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.20' | ||
| } | ||
|
|
||
| base { | ||
| archivesName = 'signalr-messagepack' | ||
| } | ||
|
|
||
| publishing { | ||
| publications { | ||
| release(MavenPublication) { | ||
| from components.java | ||
|
|
||
| artifactId 'signalr-messagepack' | ||
| description 'MessagePack protocol implementation for ASP.NET Core SignalR Client for Java applications' | ||
|
|
||
| pom { | ||
| packaging = 'jar' | ||
| inceptionYear = '2020' | ||
| url = 'https://github.com/dotnet/aspnetcore' | ||
| name = groupId + ':' + artifactId | ||
| licenses { | ||
| license { | ||
| name = 'MIT License' | ||
| url = 'https://opensource.org/licenses/MIT' | ||
| distribution = 'repo' | ||
| } | ||
| } | ||
| scm { | ||
| connection = 'scm:git:https://github.com/dotnet/aspnetcore.git' | ||
| developerConnection = 'scm:git:https://github.com/dotnet/aspnetcore.git' | ||
| url = 'https://github.com/dotnet/aspnetcore/tree/main' | ||
| } | ||
| developers { | ||
| developer { | ||
| id = 'microsoft' | ||
| name = 'Microsoft' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| tasks.withType(GenerateMavenPom).all { | ||
| destination = layout.buildDirectory.file("libs/signalr-messagepack-${project.version}.pom").get().asFile | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,61 @@ | ||
| plugins { | ||
| id 'java' | ||
| } | ||
|
|
||
| configurations { | ||
| antJUnit | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation 'org.junit.jupiter:junit-jupiter-params:5.11.2' | ||
| testImplementation 'org.junit.jupiter:junit-jupiter:5.11.2' | ||
| testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2' | ||
| implementation 'com.google.code.gson:gson:2.8.5' | ||
| implementation 'ch.qos.logback:logback-classic:1.2.3' | ||
| implementation project(':core') | ||
| implementation project(':messagepack') | ||
| implementation project(':messagepack') | ||
| antJUnit 'org.apache.ant:ant-junit:1.10.15' | ||
| } | ||
|
|
||
| sourceSets { | ||
| test { | ||
| java { | ||
| srcDir 'src' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| test { | ||
| useJUnitPlatform() | ||
| testLogging { | ||
| events "passed", "skipped", "failed" | ||
| } | ||
|
|
||
| reports { | ||
| html.required = false | ||
| junitXml.outputPerTestCase = true | ||
| junitXml.required = true | ||
| } | ||
| } | ||
|
|
||
| // Merge test results into a single file for Helix to detect JUnit test file | ||
| task testReport { | ||
| ext { | ||
| resultsDir = file("$buildDir/test-results") | ||
| mergedFile = "test-results/junit-results.xml" | ||
| } | ||
|
|
||
| doLast { | ||
| mkdir 'test-results' | ||
| ant.taskdef(name: 'junitreport', | ||
| classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator', | ||
| classpath: configurations.antJUnit.asPath) | ||
|
|
||
| ant.junitreport(tofile: mergedFile) { | ||
| fileset(dir: resultsDir, includes: '**/TEST-*.xml') | ||
| } | ||
| } | ||
| } | ||
|
|
||
| test.finalizedBy(testReport) |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wtgodbe this change broke the entire VMR now that images got updated to a newer version of the jdk. This already happened once in the past which is why we made this change: 4a3afe3
Can you please describe why the minor and patch versions were necessary to be added here?
cc @mmitche
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clean local dev is broken if you use a non-specific version
#58457
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see, thanks for sharing the details.
Arcade offers scripts to install native tools which support defining just a major version or even "latest": https://github.com/dotnet/aspnetcore/blob/main/eng/common/init-tools-native.ps1
Any reason why you can't use those? The problem with the hardcoded version is that it breaks whenever the CI images get updated. I.e. right now all aspnetcore builds should be broken. See dotnet/sdk#45822
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see any reason why we can't - I'd actually prefer it. Do we just need to add a pre-step in CI that runs the script?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We used to install the JDK manually ourselves w/ https://github.com/dotnet/aspnetcore/blob/main/eng/scripts/InstallJdk.ps1, but stopped with #54421. I was under the impression we had to use whatever was pre-installed on the build machine/in the VMR tool cache
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we need to use what's preinstalled on the machine. The Arcade script doesn't help downloading assets, it just helps finding the locally installed tool and promote it to PATH.
Let's move that discussion to dotnet/source-build#4816