Revert default archs on ARM64 change

This commit is contained in:
Steve Dower
2022-10-04 16:36:44 +01:00
parent ae58080d01
commit aa79b6eda9
2 changed files with 3 additions and 7 deletions
+2 -6
View File
@@ -93,12 +93,8 @@ class Architecture(Enum):
# x86_64 machines can run i686 containers
result.add(Architecture.i686)
if platform == "windows":
if Architecture.ARM64 in result:
result.add(Architecture.AMD64)
result.add(Architecture.x86)
elif Architecture.AMD64 in result:
result.add(Architecture.x86)
if platform == "windows" and Architecture.AMD64 in result:
result.add(Architecture.x86)
return result
+1 -1
View File
@@ -369,7 +369,7 @@ Default: `auto`
|---|---|---|---|---|
| Linux / Intel | `x86_64` | `x86_64` `i686` | `x86_64` | `i686` |
| Windows / Intel | `AMD64` | `AMD64` `x86` | `AMD64` | `x86` |
| Windows / ARM64 | `ARM64` | `ARM64` `AMD64` `x86` | `ARM64` `AMD64` | `x86` |
| Windows / ARM64 | `ARM64` | `ARM64` | `ARM64` | |
| macOS / Intel | `x86_64` | `x86_64` | `x86_64` | |
| macOS / Apple Silicon | `arm64` | `arm64` | `arm64` | |