Use MacOS-13 in CI #58465
Use MacOS-13 in CI #58465
Conversation
dotnet-issue-labeler
bot
added
the
area-infrastructure
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
| @@ -116,9 +116,9 @@ public Single<HttpResponse> send(HttpRequest httpRequest, ByteBuffer bodyContent | |||
| case "POST": | |||
| RequestBody body; | |||
| if (bodyContent != null) { | |||
| body = RequestBody.create(MediaType.parse("text/plain"), ByteString.of(bodyContent)); | |||
| body = RequestBody.Companion.create(ByteString.of(bodyContent), MediaType.parse("text/plain")); | |||
There was a problem hiding this comment.
|
/backport to release/9.0 |
|
/backport to release/8.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/aspnetcore/actions/runs/11443032159 |
|
Started backporting to release/8.0: https://github.com/dotnet/aspnetcore/actions/runs/11443034354 |
|
@wtgodbe backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Use MacOS-13 in CI
Applying: Gradle 6.9
Applying: Update gradle-wrapper.properties
Applying: Update gradle-wrapper.properties
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Update build.gradle
Applying: Fixup gradle
Using index info to reconstruct a base tree...
M global.json
M src/SignalR/clients/java/signalr/core/build.gradle
Falling back to patching base and 3-way merge...
Auto-merging src/SignalR/clients/java/signalr/core/build.gradle
Auto-merging global.json
CONFLICT (content): Merge conflict in global.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0012 Fixup gradle
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@wtgodbe an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
| @@ -24,7 +24,7 @@ | |||
| "xcopy-msbuild": "17.1.0" | |||
| }, | |||
| "native-tools": { | |||
| "jdk": "11" | |||
| "jdk": "11.0.24" | |||
There was a problem hiding this comment.
There was a problem hiding this comment.
Clean local dev is broken if you use a non-specific version
#58457
There was a problem hiding this comment.
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.
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.
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
There was a problem hiding this comment.
I was under the impression we had to use whatever was pre-installed on the build machine/in the VMR tool cache
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
* Use MacOS-13 in CI * Gradle 6.9 * Update gradle-wrapper.properties * Update gradle-wrapper.properties * Update build.gradle * Update build.gradle * Update build.gradle * Update build.gradle * Update build.gradle * Update build.gradle * Update build.gradle * Fixup gradle * Apply suggestions from code review --------- Co-authored-by: Brennan <brecon@microsoft.com>
No description provided.