Use NuGetAuthenticate@1 instead of @0#96651
Merged
akoeplinger merged 1 commit intodotnet:mainfrom Jan 9, 2024
Merged
Conversation
There is a build warning about the old version now. eng/common usages are handled by dotnet/arcade#14314
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue DetailsThere is a build warning about the old version now. eng/common usages are handled by dotnet/arcade#14314
|
ghost
assigned
steveisok
approved these changes
Jan 9, 2024
jkoritzinsky
approved these changes
Jan 9, 2024
This was referenced Jan 9, 2024
ViktorHofer
approved these changes
Jan 9, 2024
Member
Author
|
/backport to release/8.0-staging |
Contributor
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/7460644377 |
Member
Author
|
/backport to release/7.0-staging |
Contributor
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/7460650983 |
Contributor
|
@akoeplinger backporting to release/7.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Use NuGetAuthenticate@1 instead of @0
Using index info to reconstruct a base tree...
M eng/pipelines/installer/jobs/steps/build-linux-package.yml
M eng/pipelines/official/jobs/prepare-signed-artifacts.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/official/jobs/prepare-signed-artifacts.yml
Auto-merging eng/pipelines/installer/jobs/steps/build-linux-package.yml
CONFLICT (content): Merge conflict in eng/pipelines/installer/jobs/steps/build-linux-package.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use NuGetAuthenticate@1 instead of @0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@akoeplinger an error occurred while backporting to release/7.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
akoeplinger
added a commit
to akoeplinger/runtime
that referenced
this pull request
Jan 9, 2024
There is a build warning about the old version now. eng/common usages are handled by dotnet/arcade#14314 Backport of dotnet#96651
This was referenced Jan 9, 2024
akoeplinger
added a commit
to akoeplinger/runtime
that referenced
this pull request
Jan 9, 2024
There is a build warning about the old version now. eng/common usages are handled by dotnet/arcade#14314 Backport of dotnet#96651
carlossanlop
pushed a commit
that referenced
this pull request
Jan 9, 2024
There is a build warning about the old version now. eng/common usages are handled by dotnet/arcade#14314 Backport of #96651
carlossanlop
pushed a commit
that referenced
this pull request
Jan 10, 2024
There is a build warning about the old version now. eng/common usages are handled by dotnet/arcade#14314 Backport of #96651
tmds
pushed a commit
to tmds/runtime
that referenced
this pull request
Jan 23, 2024
There is a build warning about the old version now. eng/common usages are handled by dotnet/arcade#14314
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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 is a build warning about the old version now. eng/common usages are handled by dotnet/arcade#14314