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

[CI] Remove stages related to the old pkg signing and notarization. #21376

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions tools/devops/automation/build-cronjob.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ resources:
ref: refs/heads/main
endpoint: xamarin

- repository: release-scripts
type: github
name: xamarin/release-scripts
ref: refs/heads/only_codesign
endpoint: xamarin

trigger:
- main

Expand Down
6 changes: 0 additions & 6 deletions tools/devops/automation/build-lego.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ resources:
ref: refs/heads/main
endpoint: xamarin

- repository: release-scripts
type: github
name: xamarin/release-scripts
ref: refs/heads/only_codesign
endpoint: xamarin

trigger:
branches:
include:
Expand Down
17 changes: 0 additions & 17 deletions tools/devops/automation/build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ parameters:
type: boolean
default: false

- name: skipESRP
displayName: Skip ESRP
type: boolean
default: false # only to be used when testing the CI and we do not need a signed pkg

- name: pushNugets
type: boolean
displayName: 'Push Nugets (dotnet)'
Expand Down Expand Up @@ -155,12 +150,6 @@ resources:
ref: refs/heads/main
endpoint: xamarin

- repository: release-scripts
type: github
name: xamarin/release-scripts
ref: refs/heads/only_codesign
endpoint: xamarin

- repository: CustomPipelineTemplates
type: git
name: 1ESPipelineTemplates/MicroBuildTemplate
Expand Down Expand Up @@ -231,7 +220,6 @@ extends:
exclude:
- repository: yaml-templates
- repository: sdk-insertions
- repository: release-scripts
stages:
- template: templates/main-stage.yml
parameters:
Expand All @@ -242,14 +230,9 @@ extends:
pool: ${{ parameters.pool }}
runGovernanceTests: ${{ parameters.runGovernanceTests }}
forceInsertion: ${{ parameters.forceInsertion }}
skipESRP: ${{ parameters.skipESRP }}
pushNugets: ${{ parameters.pushNugets }}
pushNugetsToMaestro: ${{ parameters.pushNugetsToMaestro }}
${{ if ne(length(parameters.testConfigurations), 0)}}:
testConfigurations: ${{ parameters.testConfigurations }}
deviceTestsConfigurations: ${{ parameters.deviceTestsConfigurations }}
macTestsConfigurations: ${{ parameters.macTestsConfigurations }}
signingSetupSteps:
- template: ./templates/sign-and-notarized/setup.yml
parameters:
isPR: false
17 changes: 0 additions & 17 deletions tools/devops/automation/build-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ parameters:
type: boolean
default: false

- name: skipESRP
displayName: Skip ESRP
type: boolean
default: false # only to be used when testing the CI and we do not need a signed pkg

- name: testConfigurations
displayName: Test configurations to run
type: object
Expand Down Expand Up @@ -146,12 +141,6 @@ resources:
ref: refs/heads/main
endpoint: xamarin

- repository: release-scripts
type: github
name: xamarin/release-scripts
ref: refs/heads/only_codesign
endpoint: xamarin

- repository: CustomPipelineTemplates
type: git
name: 1ESPipelineTemplates/MicroBuildTemplate
Expand Down Expand Up @@ -216,7 +205,6 @@ extends:
exclude:
- repository: yaml-templates
- repository: sdk-insertions
- repository: release-scripts
stages:
- template: templates/main-stage.yml
parameters:
Expand All @@ -227,14 +215,9 @@ extends:
pool: ${{ parameters.pool }}
runGovernanceTests: ${{ parameters.runGovernanceTests }}
forceInsertion: ${{ parameters.forceInsertion }}
skipESRP: ${{ parameters.skipESRP }}
pushNugets: false
pushNugetsToMaestro: false
${{ if ne(length(parameters.testConfigurations), 0)}}:
testConfigurations: ${{ parameters.testConfigurations }}
deviceTestsConfigurations: ${{ parameters.deviceTestsConfigurations }}
macTestsConfigurations: ${{ parameters.macTestsConfigurations }}
signingSetupSteps:
- template: ./templates/sign-and-notarized/setup.yml
parameters:
isPR: true
6 changes: 0 additions & 6 deletions tools/devops/automation/publish-pr-html-results.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ resources:
ref: refs/heads/main
endpoint: xamarin

- repository: release-scripts
type: github
name: xamarin/release-scripts
ref: refs/heads/only_codesign
endpoint: xamarin

- repository: macios.ci
type: github
name: xamarin/macios.ci
Expand Down
21 changes: 0 additions & 21 deletions tools/devops/automation/scripts/notarize.ps1

This file was deleted.

4 changes: 0 additions & 4 deletions tools/devops/automation/templates/build/build-pkgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ parameters:
type: boolean
default: true

- name: skipESRP
type: boolean
default: false # only to be used when testing the CI and we do not need a signed pkg

- name: isPR
type: boolean

Expand Down
5 changes: 0 additions & 5 deletions tools/devops/automation/templates/build/build-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ parameters:
- name: xqaCertPass
type: string

- name: skipESRP
type: boolean
default: false # only to be used when testing the CI and we do not need a signed pkg

- name: pool
type: string
default: automatic
Expand Down Expand Up @@ -97,4 +93,3 @@ jobs:
keyringPass: ${{ parameters.keyringPass }}
gitHubToken: ${{ parameters.gitHubToken }}
xqaCertPass: ${{ parameters.xqaCertPass }}
skipESRP: ${{ parameters.skipESRP }}
3 changes: 0 additions & 3 deletions tools/devops/automation/templates/common/checkout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ steps:
- checkout: yaml-templates
clean: true

- checkout: release-scripts
clean: true

- pwsh: ./clean_git_vsts.ps1 -GithubToken "$(GitHub.Token)" -MaccorePath "$(System.DefaultWorkingDirectory)/maccore"
displayName: 'Clean git mess from VSTS'
workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-macios/tools/devops/automation/scripts
42 changes: 0 additions & 42 deletions tools/devops/automation/templates/main-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ parameters:
type: boolean
default: false

- name: skipESRP
type: boolean
default: false # only to be used when testing the CI and we do not need a signed pkg

- name: pushNugets
type: boolean
default: true # default to true until otherwhise
Expand Down Expand Up @@ -159,10 +155,6 @@ parameters:
- name: macTestsConfigurations
type: object

- name: signingSetupSteps
type: stepList
default: []

- name: legacyPackageJobs
type: object
default: [
Expand Down Expand Up @@ -264,7 +256,6 @@ stages:
keyringPass: $(pass--lab--mac--builder--keychain)
gitHubToken: $(Github.Token)
xqaCertPass: $(xqa--certificates--password)
skipESRP: ${{ parameters.skipESRP }}
pool: ${{ parameters.pool }}

- stage: build_macos_tests
Expand All @@ -284,23 +275,6 @@ stages:
xqaCertPass: $(xqa--certificates--password)
pool: ${{ parameters.pool }}

- stage: prepare_packages_legacy
displayName: '${{ parameters.stageDisplayNamePrefix }}Prepare legacy packages'
condition: and(eq(dependencies.build_packages.result, 'Succeeded'), eq('${{ parameters.enableLegacySigning }}', true))
dependsOn:
- build_packages
- configure_build
jobs:
- template: ./sign-and-notarized/prepare-pkg-stage.yml
parameters:
isPR: ${{ parameters.isPR }}
repositoryAlias: ${{ parameters.repositoryAlias }}
commit: ${{ parameters.commit }}
signingSetupSteps: ${{ parameters.signingSetupSteps }}
keyringPass: $(pass--lab--mac--builder--keychain)
skipESRP: ${{ parameters.skipESRP }}
packages: ${{ parameters.legacyPackageJobs }}

# .NET Release Prep and VS Insertion Stages, only execute them when the build comes from an official branch and is not a schedule build from OneLoc
# setting the stage at this level makes the graph of the UI look better, else the lines overlap and is not clear.
- ? ${{ if
Expand Down Expand Up @@ -328,19 +302,3 @@ stages:
commit: ${{ parameters.commit }}
pushNugets: ${{ parameters.pushNugets }}
pushNugetsToMaestro: ${{ parameters.pushNugetsToMaestro }}

- stage: funnel
displayName: '${{ parameters.stageDisplayNamePrefix }}Collect signed artifacts'
condition: and(eq(dependencies.prepare_packages_legacy.result, 'Succeeded'), eq('${{ parameters.enableLegacySigning }}', true))
dependsOn:
- prepare_packages_legacy
- configure_build
jobs:
- template: ./sign-and-notarized/funnel.yml
parameters:
isPR: ${{ parameters.isPR }}
repositoryAlias: ${{ parameters.repositoryAlias }}
commit: ${{ parameters.commit }}
packages: # flatten the pkgs for the parameter
- ${{ each pkg in parameters.legacyPackageJobs }}:
- ${{ pkg }}
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ resources:
ref: refs/heads/main
endpoint: xamarin

- repository: release-scripts
type: github
name: xamarin/release-scripts
ref: refs/heads/only_codesign
endpoint: xamarin

variables:
- template: ../variables/common.yml
- name: DisablePipelineConfigDetector
Expand Down
18 changes: 0 additions & 18 deletions tools/devops/automation/templates/pipelines/build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ parameters:
type: boolean
default: false

- name: skipESRP
displayName: Skip ESRP
type: boolean
default: false # only to be used when testing the CI and we do not need a signed pkg

- name: pushNugets
type: boolean
default: true
Expand All @@ -55,10 +50,6 @@ parameters:
type: boolean
default: false

- name: signingSetupSteps
type: stepList
default: []

- name: testConfigurations
displayName: Test configurations to run
type: object
Expand Down Expand Up @@ -164,13 +155,6 @@ resources:
ref: refs/heads/main
endpoint: xamarin

- repository: release-scripts
type: github
name: xamarin/release-scripts
ref: refs/heads/only_codesign
endpoint: xamarin


variables:
- ${{ if eq(parameters.isPR, false) }}:
- ${{ if contains(variables['Build.DefinitionName'], 'private') }}:
Expand Down Expand Up @@ -202,7 +186,6 @@ stages:
runGovernanceTests: ${{ parameters.runGovernanceTests }}
enableAPIDiff: ${{ parameters.enableAPIDiff }}
forceInsertion: ${{ parameters.forceInsertion }}
skipESRP: ${{ parameters.skipESRP }}
pushNugets: ${{ parameters.pushNugets }}
pushNugetsToMaestro: ${{ parameters.pushNugetsToMaestro }}
${{ if ne(length(parameters.testConfigurations), 0)}}:
Expand All @@ -211,4 +194,3 @@ stages:
macTestsConfigurations: ${{ parameters.macTestsConfigurations }}
azureStorage: ${{ variables['azureStorage'] }}
azureContainer: ${{ variables['azureContainer'] }}
signingSetupSteps: ${{ parameters.signingSetupSteps }}
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,6 @@ resources:
ref: refs/heads/main
endpoint: xamarin

- repository: release-scripts
type: github
name: xamarin/release-scripts
ref: refs/heads/only_codesign
endpoint: xamarin

variables:
- template: ../variables/common.yml
- name: DisablePipelineConfigDetector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,6 @@ resources:
ref: refs/heads/main
endpoint: xamarin

- repository: release-scripts
type: github
name: xamarin/release-scripts
ref: refs/heads/only_codesign
endpoint: xamarin

variables:
- template: ../variables/common.yml
- name: DisablePipelineConfigDetector
Expand Down
Loading
Loading