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

Rename mariner package to cm #17506

Merged
merged 3 commits into from Jun 13, 2022
Merged

Rename mariner package to cm #17506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
963237f
Rename mariner package to cm
TravisEz13 Jun 8, 2022
c0d5b12
fix condition
TravisEz13 Jun 8, 2022
adfd8c7
fix signing pattern
TravisEz13 Jun 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/packages.microsoft.com/mapping.json
View file
Open in desktop
Expand Up @@ -18,13 +18,13 @@
{
"url": "cbl-mariner-2.0-prod-Microsoft-x86_64",
"distribution" : ["bionic"],
"PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm",
"PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm.x86_64.rpm",
"channel" : "stable"
},
{
"url": "cbl-mariner-2.0-preview-Microsoft-x86_64",
"distribution" : ["bionic"],
"PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm",
"PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm.x86_64.rpm",
"channel" : "preview"
},
{
Expand Down
4 changes: 2 additions & 2 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.p
Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force
$DebianDistributions = @("deb")
$RedhatFullDistributions = @("rh")
$RedhatFddDistributions = @("cm1")
$RedhatFddDistributions = @("cm")
$RedhatDistributions = @()
$RedhatDistributions += $RedhatFullDistributions
$RedhatDistributions += $RedhatFddDistributions
Expand Down Expand Up @@ -1354,7 +1354,7 @@ function Get-PackageDependencies
"openssl-libs",
"libicu"
)
} elseif ($Distribution -eq 'cm1') {
} elseif ($Distribution -eq 'cm') {
# Taken from the list here:
# https://github.com/dotnet/dotnet-docker/blob/d451d6e9427f58c8508f1297c862663a27eb609f/src/runtime-deps/6.0/cbl-mariner1.0/amd64/Dockerfile#L6
$Dependencies = @(
Expand Down
2 changes: 1 addition & 1 deletion tools/packaging/releaseTests/sbom.tests.ps1
View file
Open in desktop
Expand Up @@ -47,8 +47,8 @@ Describe "Verify SBOMs" {
try {
if (Get-Command -Name rpm2cpio -ErrorAction SilentlyContinue) {
rpm2cpio $case.FilePath | cpio -i --make-directories 2>cpio.log
$manifestPath = Get-ChildItem -Path manifest.spdx.json -Recurse | Select-Object -First 1 -ExpandProperty FullName
$extractedPath = Get-ChildItem -Path system.management.automation.dll -Recurse | Select-Object -First 1 -ExpandProperty DirectoryName
$manifestPath = Join-Path $extractedPath -ChildPath '/_manifest/spdx_2.2/manifest.spdx.json'
} else {
$skip = "rpm2cpio not found"
}
Expand Down
13 changes: 12 additions & 1 deletion tools/releaseBuild/azureDevOps/templates/linux.yml
View file
Open in desktop
Expand Up @@ -84,6 +84,16 @@ jobs:
PackageVersion: $(Version)
sourceScanPath: '$(PowerShellRoot)/tools'

- ${{ if eq(variables.build,'rpm') }} :
- template: Sbom.yml@ComplianceRepo
parameters:
BuildDropPath: '$(System.ArtifactsDirectory)/pwshMarinerBuildAmd64'
Build_Repository_Uri: $(Github_Build_Repository_Uri)
displayName: Mariner SBOM
PackageName: PowerShell Linux Framework Dependent
PackageVersion: $(Version)
sourceScanPath: '$(PowerShellRoot)/tools'

- ${{ if eq(variables.build,'deb') }} :
- template: Sbom.yml@ComplianceRepo
parameters:
Expand Down Expand Up @@ -269,7 +279,8 @@ jobs:
signOutputPath: $(Build.StagingDirectory)\signedPackages
certificateId: "CP-459159-Pgp"
pattern: |
**\*.cm1.*.rpm
**\*.cm.*.rpm
**\*.cm?.*.rpm
useMinimatch: true
shouldSign: $(SHOULD_SIGN)
displayName: Sign Mariner RPM
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ steps:
- pwsh: |
$message = @()
Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.rpm | ForEach-Object {
if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d\.\d\.\d(_[a-z]*\.\d+)?-1.(rh|cm1).x86_64\.rpm')
if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d+\.\d+\.\d+(_[a-z]*\.\d+)?-1.(rh|cm).x86_64\.rpm')
{
$messageInstance = "$($_.Name) is not a valid package name"
$message += $messageInstance
Expand Down