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.

Sign up for GitHub

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

Jump to bottom

Set correct arm64v8 info for mariner2 #798

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Set correct arm64v8 info for mariner2 #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
760f25f
Set correct arm64v8 info for mariner2
harryzcy Mar 4, 2024
fb79848
Merge branch 'master' into mariner2-arm64-v8
harryzcy Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
"ImageName": "mariner2-arm64",
"IsLinux": true,
"JobName": "mariner2_arm64",
"OsVersion": "Mariner 2.0 ARM 64v7 (In Validation)",
"OsVersion": "Mariner 2.0 ARM 64v8 (In Validation)",
"TagList": "preview-7.4-mariner-2.0-arm64;preview-mariner-2.0-arm64",
"UseInCI": false
},
Expand Down Expand Up @@ -611,7 +611,7 @@
"ImageName": "mariner2-arm64",
"IsLinux": true,
"JobName": "mariner2_arm64",
"OsVersion": "Mariner 2.0 ARM 64v7 (In Validation)",
"OsVersion": "Mariner 2.0 ARM 64v8 (In Validation)",
"TagList": "7.3-mariner-2.0-arm64;mariner-2.0-arm64",
"UseInCI": false
},
Expand Down
2 changes: 1 addition & 1 deletion release/7-3/mariner2-arm64/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ FROM --platform=linux/arm64 mcr.microsoft.com/cbl-mariner/base/core:2.0 AS final
LANG=en_US.UTF-8 \
# set a fixed location for the Module analysis cache
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8-Mariner-2

# Copy only the files we need from the previous stage
COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
Expand Down
2 changes: 1 addition & 1 deletion release/7-3/mariner2-arm64/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell${channelTag}-${PS_VERSION}-linux-arm64.tar.gz",
"osVersion": "Mariner 2.0 ARM 64v7",
"osVersion": "Mariner 2.0 ARM 64v8",
"SkipGssNtlmSspTests": true,
"ShortDistroName": "mariner",
"shortTags": [
Expand Down
2 changes: 1 addition & 1 deletion release/7-4/mariner2-arm64/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ FROM setup-tdnf-repa AS powershell
LANG=en_US.UTF-8 \
# set a fixed location for the Module analysis cache
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Mariner-2.0
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8-Mariner-2.0

RUN --mount=type=cache,target=/var/cache/tdnf \
# install dependencies
Expand Down
2 changes: 1 addition & 1 deletion release/7-4/mariner2-arm64/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell-${PS_VERSION}-1.cm.aarch64.rpm",
"osVersion": "Mariner 2.0 ARM 64v7",
"osVersion": "Mariner 2.0 ARM 64v8",
"SkipGssNtlmSspTests": true,
"ShortDistroName": "mariner",
"shortTags": [
Expand Down
2 changes: 1 addition & 1 deletion release/7-5/mariner2-arm64/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ FROM setup-tdnf-repa AS powershell
LANG=en_US.UTF-8 \
# set a fixed location for the Module analysis cache
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v7-Mariner-2
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-arm64v8-Mariner-2

RUN --mount=type=cache,target=/var/cache/tdnf \
# install dependencies
Expand Down
2 changes: 1 addition & 1 deletion release/7-5/mariner2-arm64/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"IsLinux" : true,
"UseLinuxVersion": false,
"PackageFormat": "powershell${channelTag}-${PS_VERSION}-1.cm.aarch64.rpm",
"osVersion": "Mariner 2.0 ARM 64v7",
"osVersion": "Mariner 2.0 ARM 64v8",
"SkipGssNtlmSspTests": true,
"ShortDistroName": "mariner",
"shortTags": [
Expand Down
Loading