Skip to content

[release/9.0-staging] Fix Tizen linux-armel build#110614

Merged
akoeplinger merged 2 commits into
release/9.0-stagingfrom
backport/pr-110514-to-release/9.0-staging
Dec 11, 2024
Merged

[release/9.0-staging] Fix Tizen linux-armel build#110614
akoeplinger merged 2 commits into
release/9.0-stagingfrom
backport/pr-110514-to-release/9.0-staging

Conversation

@github-actions

@github-actions github-actions Bot commented Dec 11, 2024

Copy link
Copy Markdown
Contributor

Backport of #110514 to release/9.0-staging

/cc @akoeplinger @am11

Customer Impact

  • Customer reported
  • Found internally

The linux-armel checked CoreCLR_NonPortable build is broken without this. It is an infrastructure-only change and only impacts testing CI jobs for Tizen.

Regression

  • Yes
  • No

Testing

CI Testing.

Risk

Low. Only affects CI testing jobs for Tizen.

IMPORTANT: If this backport is for a servicing release, please verify that:

  • The PR target branch is release/X.0-staging, not release/X.0.

Package authoring no longer needed in .NET 9

IMPORTANT: Starting with .NET 9, you no longer need to edit a NuGet package's csproj to enable building and bump the version.
Keep in mind that we still need package authoring in .NET 8 and older versions.

@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

@akoeplinger

akoeplinger commented Dec 11, 2024

Copy link
Copy Markdown
Member

Infrastructure-only change, tell mode. Marking as Servicing-approved.

/cc @carlossanlop

@akoeplinger akoeplinger changed the title [release/9.0-staging] Fix linux-armel build [release/9.0-staging] Fix Tizen linux-armel build Dec 11, 2024
@akoeplinger akoeplinger merged commit ab31116 into release/9.0-staging Dec 11, 2024
@akoeplinger akoeplinger deleted the backport/pr-110514-to-release/9.0-staging branch December 11, 2024 17:19
@akoeplinger

Copy link
Copy Markdown
Member

/backport to release/8.0-staging

@github-actions

Copy link
Copy Markdown
Contributor Author

Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/12379759394

@github-actions

Copy link
Copy Markdown
Contributor Author

@akoeplinger backporting to release/8.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Fix linux-armel build
Applying: Try the dynamic approach
error: sha1 information is lacking or useless (eng/common/cross/toolchain.cmake).
error: could not build fake ancestor
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 0002 Try the dynamic approach
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

3 participants