-
Notifications
You must be signed in to change notification settings - Fork 8k
Closed
Description
Manual cherrypick required.
#39483 failed to apply on top of branch "release-1.15":
Applying: Allow no cpuinfo
Applying: allow fail
Applying: Bump kind image
Applying: debug
Applying: workaround env var
Applying: fix docker build
Applying: log
Applying: arch in build
Applying: set arch again
Applying: fix arch type
Applying: more logs
Applying: more env
Applying: Make single image architecture aware
Applying: VM per-arch
Applying: Opt out when requiring emulation
Applying: Fix jwt server
Applying: fmt
Applying: Revert env var hacks
Using index info to reconstruct a base tree...
M bin/init.sh
Falling back to patching base and 3-way merge...
Auto-merging bin/init.sh
CONFLICT (content): Merge conflict in bin/init.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0018 Revert env var hacks
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".
Metadata
Metadata
Assignees
Labels
No labels