Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly specify platform and architecture for arm32 images #739

Merged
merged 8 commits into from Mar 8, 2023

Conversation

anamnavi
Copy link
Member

@anamnavi anamnavi commented Mar 6, 2023

PR Summary

This PR fixes arm32 images that have "arm64" specified for their architecture property in meta.json and also specifies the platform for the arm32 images.

PR Checklist

@anamnavi anamnavi marked this pull request as draft March 6, 2023 15:40
@@ -22,5 +22,5 @@
"EndOfLife": "2023-04-02",
"DistributionState": "Validated",
"UseInCi": false,
"Architecture": "arm64"
"Architecture": "arm32"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is more correctly, the host architecture and we don't have an ARM32 host.
We either need to translate this to ARM64 when choosing a host or add another field.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I made the changes to make this work for CI and image build, test and release.

@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

FROM --platform=linux/arm/v7 ubuntu:bionic AS installer-env
FROM --platform=linux/arm32v7 ubuntu:bionic AS installer-env
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the original was correct.

@TravisEz13 TravisEz13 marked this pull request as ready for review March 8, 2023 21:40
@TravisEz13 TravisEz13 merged commit bf2ea4f into PowerShell:master Mar 8, 2023
54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants