From 4cdfa8aa8169a90bd5485b3baa10b1d31edcae95 Mon Sep 17 00:00:00 2001 From: Martin Zikmund Date: Mon, 11 Nov 2024 16:15:23 +0100 Subject: [PATCH] refactor: Move CI files into subfolders --- build/ci/.azure-devops-stages.yml | 46 +-- build/ci/.azure-devops-wasm-tests.yml | 306 ------------------ build/ci/{ => build}/.azure-devops-macos.yml | 0 .../.azure-devops-package-native-assets.yml | 0 .../.azure-devops-package-netcoremobile.yml | 0 .../.azure-devops-package-reference.yml | 0 ...zure-devops-package-skia-native-assets.yml | 0 .../.azure-devops-package-skia.yml | 0 .../.azure-devops-package-wasm.yml | 0 .../ci/{ => build}/.azure-devops-package.yml | 0 .../{ => build}/.azure-devops-uwp-convert.yml | 0 build/ci/{ => build}/.azure-devops-wasdk.yml | 0 build/ci/{ => docs}/.azure-devops-docs.yml | 0 .../.azure-devops-publish-nuget-dev.yml | 0 .../.azure-devops-publish-nuget-prod-dev.yml | 0 .../.azure-devops-publish-nuget-prod.yml | 0 .../{ => setup}/.azure-devops-commitsar.yml | 2 +- .../.azure-devops-markdown-lint.yml | 0 .../.azure-devops-pipeline-validations.yml | 2 +- .../{ => setup}/.azure-devops-spell-check.yml | 0 .../.azure-devops-android-tests.yml | 0 .../.azure-devops-ios-tests-run.yml | 0 .../{ => tests}/.azure-devops-ios-tests.yml | 0 .../.azure-devops-project-template-tests.yml | 0 .../.azure-devops-screenshot-compare.yml | 0 .../{ => tests}/.azure-devops-skia-tests.yml | 0 .../{ => tests}/.azure-devops-unit-tests.yml | 0 .../.azure-devops-wasm-tests.yml} | 0 28 files changed, 25 insertions(+), 331 deletions(-) delete mode 100644 build/ci/.azure-devops-wasm-tests.yml rename build/ci/{ => build}/.azure-devops-macos.yml (100%) rename build/ci/{ => build}/.azure-devops-package-native-assets.yml (100%) rename build/ci/{ => build}/.azure-devops-package-netcoremobile.yml (100%) rename build/ci/{ => build}/.azure-devops-package-reference.yml (100%) rename build/ci/{ => build}/.azure-devops-package-skia-native-assets.yml (100%) rename build/ci/{ => build}/.azure-devops-package-skia.yml (100%) rename build/ci/{ => build}/.azure-devops-package-wasm.yml (100%) rename build/ci/{ => build}/.azure-devops-package.yml (100%) rename build/ci/{ => build}/.azure-devops-uwp-convert.yml (100%) rename build/ci/{ => build}/.azure-devops-wasdk.yml (100%) rename build/ci/{ => docs}/.azure-devops-docs.yml (100%) rename build/ci/{ => publishing}/.azure-devops-publish-nuget-dev.yml (100%) rename build/ci/{ => publishing}/.azure-devops-publish-nuget-prod-dev.yml (100%) rename build/ci/{ => publishing}/.azure-devops-publish-nuget-prod.yml (100%) rename build/ci/{ => setup}/.azure-devops-commitsar.yml (91%) rename build/ci/{ => setup}/.azure-devops-markdown-lint.yml (100%) rename build/ci/{ => setup}/.azure-devops-pipeline-validations.yml (79%) rename build/ci/{ => setup}/.azure-devops-spell-check.yml (100%) rename build/ci/{ => tests}/.azure-devops-android-tests.yml (100%) rename build/ci/{ => tests}/.azure-devops-ios-tests-run.yml (100%) rename build/ci/{ => tests}/.azure-devops-ios-tests.yml (100%) rename build/ci/{ => tests}/.azure-devops-project-template-tests.yml (100%) rename build/ci/{ => tests}/.azure-devops-screenshot-compare.yml (100%) rename build/ci/{ => tests}/.azure-devops-skia-tests.yml (100%) rename build/ci/{ => tests}/.azure-devops-unit-tests.yml (100%) rename build/ci/{.azure-devops-wasm-uitests.yml => tests/.azure-devops-wasm-tests.yml} (100%) diff --git a/build/ci/.azure-devops-stages.yml b/build/ci/.azure-devops-stages.yml index 974bedc9793d..b5ec369ad92f 100644 --- a/build/ci/.azure-devops-stages.yml +++ b/build/ci/.azure-devops-stages.yml @@ -3,7 +3,7 @@ stages: - stage: setup displayName: Setup jobs: - - template: .azure-devops-setup.yml + - template: setup/.azure-devops-setup.yml - stage: convert_tree displayName: UWP Tree Conversion @@ -21,25 +21,25 @@ stages: - convert_tree jobs: - - template: .azure-devops-package-netcoremobile.yml + - template: build/.azure-devops-package-netcoremobile.yml parameters: poolName: '$(windowsScaledPool)' UNO_UWP_BUILD: true XAML_FLAVOR_BUILD: UWP - - template: .azure-devops-package-wasm.yml + - template: build/.azure-devops-package-wasm.yml parameters: poolName: '$(linuxScaledPool)' UNO_UWP_BUILD: true XAML_FLAVOR_BUILD: UWP - - template: .azure-devops-package-reference.yml + - template: build/.azure-devops-package-reference.yml parameters: poolName: '$(linuxScaledPool)' UNO_UWP_BUILD: true XAML_FLAVOR_BUILD: UWP - - template: .azure-devops-package-skia.yml + - template: build/.azure-devops-package-skia.yml parameters: poolName: '$(linuxScaledPool)' macOSImageName: '$(macOSVMImage)' @@ -52,25 +52,25 @@ stages: - setup jobs: - - template: .azure-devops-package-netcoremobile.yml + - template: build/.azure-devops-package-netcoremobile.yml parameters: poolName: '$(windowsScaledPool)' UNO_UWP_BUILD: false XAML_FLAVOR_BUILD: WinUI - - template: .azure-devops-package-wasm.yml + - template: build/.azure-devops-package-wasm.yml parameters: poolName: '$(linuxScaledPool)' UNO_UWP_BUILD: false XAML_FLAVOR_BUILD: WinUI - - template: .azure-devops-package-reference.yml + - template: build/.azure-devops-package-reference.yml parameters: poolName: '$(linuxScaledPool)' UNO_UWP_BUILD: false XAML_FLAVOR_BUILD: WinUI - - template: .azure-devops-package-skia.yml + - template: build/.azure-devops-package-skia.yml parameters: poolName: '$(linuxScaledPool)' macOSImageName: '$(macOSVMImage)' @@ -84,7 +84,7 @@ stages: - binaries_build_winui jobs: - - template: .azure-devops-package.yml + - template: build/.azure-devops-package.yml parameters: poolName: '$(windowsScaledPool)' @@ -94,7 +94,7 @@ stages: - packages_build jobs: - - template: .azure-devops-project-template-tests.yml + - template: tests/.azure-devops-project-template-tests.yml parameters: poolName: '$(windowsScaledPool)' vmImageWindows: $(windows2022HostedVMImage) @@ -111,7 +111,7 @@ stages: jobs: - - template: .azure-devops-unit-tests.yml + - template: tests/.azure-devops-unit-tests.yml parameters: poolName: '$(windowsScaledPool)' @@ -122,7 +122,7 @@ stages: jobs: - - template: .azure-devops-wasm-uitests.yml + - template: tests/.azure-devops-wasm-tests.yml parameters: poolName: '$(linuxScaledPool)' @@ -133,7 +133,7 @@ stages: - convert_tree jobs: - - template: .azure-devops-skia-tests.yml + - template: tests/.azure-devops-skia-tests.yml parameters: vmImage: '$(windows2022HostedVMImage)' vmMacImage: '$(macOSVMImage)' @@ -148,7 +148,7 @@ stages: - setup jobs: - - template: .azure-devops-skia-tests.yml + - template: tests/.azure-devops-skia-tests.yml parameters: vmImage: '$(windows2022HostedVMImage)' vmMacImage: '$(macOSVMImage)' @@ -163,7 +163,7 @@ stages: - setup jobs: - - template: .azure-devops-macos.yml + - template: tests/.azure-devops-macos.yml parameters: vmImage: '$(macOSVMImage)' xCodeRoot: '$(xCodeRoot)' @@ -174,7 +174,7 @@ stages: - setup jobs: - - template: .azure-devops-android-tests.yml + - template: tests/.azure-devops-android-tests.yml parameters: vmWindowsImage: '$(windows2019HostedVMImage)' vmLinuxImage: '$(linuxVMImage)' @@ -188,7 +188,7 @@ stages: - setup jobs: - - template: .azure-devops-ios-tests.yml + - template: tests/.azure-devops-ios-tests.yml parameters: vmImage: '$(macOSVMImage)' vmImageTest: '$(macOSVMImage_UITests)' @@ -201,7 +201,7 @@ stages: - setup jobs: - - template: .azure-devops-wasdk.yml + - template: tests/.azure-devops-wasdk.yml parameters: poolName: '$(windowsScaledPool)' @@ -216,7 +216,7 @@ stages: - skia_tests_winui jobs: - - template: .azure-devops-screenshot-compare.yml + - template: tests/.azure-devops-screenshot-compare.yml parameters: poolName: '$(windowsScaledPool)' @@ -228,7 +228,7 @@ stages: condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'), not(eq(variables['build.reason'], 'PullRequest'))) dependsOn: packages_build jobs: - - template: .azure-devops-publish-nuget-dev.yml + - template: publishing/.azure-devops-publish-nuget-dev.yml parameters: vmImage: '$(windows2022HostedVMImage)' @@ -237,7 +237,7 @@ stages: condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), not(eq(variables['build.reason'], 'PullRequest'))) dependsOn: packages_build jobs: - - template: .azure-devops-publish-nuget-prod-dev.yml + - template: publishing/.azure-devops-publish-nuget-prod-dev.yml parameters: vmImage: '$(windows2022HostedVMImage)' @@ -246,6 +246,6 @@ stages: condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), not(eq(variables['build.reason'], 'PullRequest'))) dependsOn: Publish_Prod_Dev jobs: - - template: .azure-devops-publish-nuget-prod.yml + - template: publishing/.azure-devops-publish-nuget-prod.yml parameters: vmImage: '$(windows2022HostedVMImage)' diff --git a/build/ci/.azure-devops-wasm-tests.yml b/build/ci/.azure-devops-wasm-tests.yml deleted file mode 100644 index ed4bee0a99b1..000000000000 --- a/build/ci/.azure-devops-wasm-tests.yml +++ /dev/null @@ -1,306 +0,0 @@ -parameters: - vmImage: '' - -jobs: -- job: Wasm_UITests_Build - displayName: 'Build WebAssembly SamplesApp UI Tests' - container: nv-bionic-wasm - - pool: ${{ parameters.poolName }} - - variables: - NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget - - strategy: - matrix: - UWP: - UNO_UWP_BUILD: true - XAML_FLAVOR_BUILD: UWP - - WinUI: - UNO_UWP_BUILD: false - XAML_FLAVOR_BUILD: WinUI - - steps: - - checkout: self - clean: true - - - template: templates/download-winui-converted-tree.yml - - - template: templates/gitversion.yml - - template: templates/dotnet-install.yml - - - template: templates/nuget-cache.yml - parameters: - nugetPackages: $(NUGET_PACKAGES) - - - bash: | - dotnet publish /r /nr:false /p:Configuration=Release /p:UnoTargetFrameworkOverride=net9.0 src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj /bl:$(build.artifactstagingdirectory)/build-wasm-$(XAML_FLAVOR_BUILD)-uitest-net9-$(GitVersion.FullSemVer).binlog - - displayName: 'Build sample app (net9.0)' - - - task: CopyFiles@2 - displayName: 'Publish WebAssembly Site (net9.0)' - inputs: - SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.Wasm/bin/Release/net9.0/browser-wasm/publish/wwwroot - Contents: '**/*.*' - TargetFolder: $(build.artifactstagingdirectory)/site-net9.0-$(XAML_FLAVOR_BUILD) - CleanTargetFolder: false - OverWrite: false - flattenFolders: false - - - task: PublishBuildArtifacts@1 - displayName: 'Publish WebAssembly sample app build artifacts' - condition: always() - retryCountOnTaskFailure: 3 - inputs: - PathtoPublish: $(build.artifactstagingdirectory) - ArtifactName: wasm-uitest-binaries - ArtifactType: Container - - -- job: Wasm_UITests_Snap - displayName: 'Run WebAssembly Snapshots Tests' - dependsOn: - - Wasm_UITests_Build - - container: nv-bionic-wasm - - pool: ${{ parameters.poolName }} - - variables: - NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget - SITE_SUFFIX: 'net9.0' - - steps: - - checkout: self - clean: true - - - template: templates/dotnet-install.yml - - - task: DownloadBuildArtifacts@0 - inputs: - artifactName: wasm-uitest-binaries - downloadPath: '$(build.sourcesdirectory)/build' - - - bash: | - set -euo pipefail - set -x - IFS=$'\n\t' - dotnet tool uninstall dotnet-serve -g || true - dotnet tool uninstall dotnet-serve --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true - dotnet tool install dotnet-serve --version 1.10.140 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true - export PATH="$PATH:$BUILD_SOURCESDIRECTORY/build/tools" - $BUILD_SOURCESDIRECTORY/build/tools/dotnet-serve -p 8000 -d "$BUILD_SOURCESDIRECTORY/build/wasm-uitest-binaries/site-net9.0-UWP" & - cd $BUILD_SOURCESDIRECTORY/src/SamplesApp/SamplesApp.Wasm.UITests - npm install - node app - - env: - BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)" - BUILD_ARTIFACTSTAGINGDIRECTORY: "$(build.artifactstagingdirectory)" - SITE_SUFFIX: "$(SITE_SUFFIX)" - - displayName: 'Running UI Tests' - - - task: CopyFiles@2 - displayName: 'Publish Wasm Tests results' - inputs: - SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.Wasm.UITests/out - Contents: '**/*.*' - TargetFolder: $(build.artifactstagingdirectory)/screenshots/wasm - CleanTargetFolder: false - OverWrite: false - flattenFolders: false - - - task: PublishBuildArtifacts@1 - retryCountOnTaskFailure: 3 - inputs: - PathtoPublish: $(build.artifactstagingdirectory) - ArtifactName: uitests-results - ArtifactType: Container - - -- job: Wasm_UITests_Automated - displayName: 'Run WebAssembly' - dependsOn: - - Wasm_UITests_Build - - container: nv-bionic-wasm - - strategy: - matrix: - '.NET 9 UWP UI Tests': - SITE_SUFFIX: 'net9.0-UWP' - UITEST_AUTOMATED_GROUP: 'Default' - UITEST_TEST_TIMEOUT: '120s' - IS_RUNTIME_TESTS: false - IS_UI_TESTS: true - - '.NET 9 WinUI Benchmarks': - SITE_SUFFIX: 'net9.0-WinUI' - UITEST_AUTOMATED_GROUP: 'Benchmarks' - UITEST_TEST_TIMEOUT: '15m' - IS_RUNTIME_TESTS: false - IS_UI_TESTS: true - - '.NET 9 UWP Runtime Tests 1': - SITE_SUFFIX: 'net9.0-UWP' - UITEST_AUTOMATED_GROUP: 'RuntimeTests' - UITEST_TEST_TIMEOUT: '20m' - UITEST_RUNTIME_TEST_GROUP: 0 - UITEST_RUNTIME_TEST_GROUP_COUNT: 3 - IS_RUNTIME_TESTS: true - IS_UI_TESTS: false - - '.NET 9 UWP Runtime Tests 2': - SITE_SUFFIX: 'net9.0-UWP' - UITEST_AUTOMATED_GROUP: 'RuntimeTests' - UITEST_TEST_TIMEOUT: '20m' - UITEST_RUNTIME_TEST_GROUP: 1 - UITEST_RUNTIME_TEST_GROUP_COUNT: 3 - IS_RUNTIME_TESTS: true - IS_UI_TESTS: false - - '.NET 9 UWP Runtime Tests 3': - SITE_SUFFIX: 'net9.0-UWP' - UITEST_AUTOMATED_GROUP: 'RuntimeTests' - UITEST_TEST_TIMEOUT: '20m' - UITEST_RUNTIME_TEST_GROUP: 2 - UITEST_RUNTIME_TEST_GROUP_COUNT: 3 - IS_RUNTIME_TESTS: true - IS_UI_TESTS: false - - '.NET 9 WinUI Runtime Tests 1': - SITE_SUFFIX: 'net9.0-WinUI' - UITEST_AUTOMATED_GROUP: 'RuntimeTests' - UITEST_TEST_TIMEOUT: '20m' - UITEST_RUNTIME_TEST_GROUP: 0 - UITEST_RUNTIME_TEST_GROUP_COUNT: 3 - IS_RUNTIME_TESTS: true - IS_UI_TESTS: false - - '.NET 9 WinUI Runtime Tests 2': - SITE_SUFFIX: 'net9.0-WinUI' - UITEST_AUTOMATED_GROUP: 'RuntimeTests' - UITEST_TEST_TIMEOUT: '20m' - UITEST_RUNTIME_TEST_GROUP: 1 - UITEST_RUNTIME_TEST_GROUP_COUNT: 3 - IS_RUNTIME_TESTS: true - IS_UI_TESTS: false - - '.NET 9 WinUI Runtime Tests 3': - SITE_SUFFIX: 'net9.0-WinUI' - UITEST_AUTOMATED_GROUP: 'RuntimeTests' - UITEST_TEST_TIMEOUT: '20m' - UITEST_RUNTIME_TEST_GROUP: 2 - UITEST_RUNTIME_TEST_GROUP_COUNT: 3 - IS_RUNTIME_TESTS: true - IS_UI_TESTS: false - - pool: ${{ parameters.poolName }} - - variables: - NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget - - steps: - - checkout: self - clean: true - - - template: templates/dotnet-install.yml - - - template: templates/nuget-cache.yml - parameters: - nugetPackages: $(NUGET_PACKAGES) - - - task: NodeTool@0 - displayName: 'Install Node.js' - inputs: - versionSpec: '18.x' - - - task: DownloadBuildArtifacts@0 - displayName: 'Download WebAssembly binaries' - inputs: - artifactName: wasm-uitest-binaries - downloadPath: '$(build.sourcesdirectory)/build' - - - task: DownloadBuildArtifacts@0 - condition: gt(variables['System.JobAttempt'], 1) - continueOnError: true - displayName: Download previous test runs failed tests - inputs: - artifactName: uitests-failure-results - downloadPath: '$(build.sourcesdirectory)/build' - - ## First ui tests run - - bash: | - chmod +x $BUILD_SOURCESDIRECTORY/build/test-scripts/wasm-run-automated-uitests.sh - $BUILD_SOURCESDIRECTORY/build/test-scripts/wasm-run-automated-uitests.sh - - env: - BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)" - BUILD_ARTIFACTSTAGINGDIRECTORY: "$(build.artifactstagingdirectory)" - UITEST_TEST_TIMEOUT: "$(UITEST_TEST_TIMEOUT)" - SITE_SUFFIX: "$(SITE_SUFFIX)" - - displayName: 'Running UI Tests' - - - task: PublishTestResults@2 - condition: always() - inputs: - testResultsFiles: '$(build.sourcesdirectory)/build/TestResult-original.xml' - testRunTitle: 'WebAssembly Test Run $(SITE_SUFFIX)' - testResultsFormat: 'NUnit' - # This is the first run, we don't fail if there are failed tests, or if results file is missing. We'll wait for the second run. - # Note: failTaskOnMissingResultsFile default is false. - failTaskOnFailedTests: false - searchFolder: '$(build.artifactstagingdirectory)/screenshots/wasm-automated' # https://github.com/microsoft/azure-pipelines-tasks/issues/10072 - - ## Second ui tests run - - bash: | - chmod +x $BUILD_SOURCESDIRECTORY/build/test-scripts/wasm-run-automated-uitests.sh - $BUILD_SOURCESDIRECTORY/build/test-scripts/wasm-run-automated-uitests.sh - - env: - BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)" - BUILD_ARTIFACTSTAGINGDIRECTORY: "$(build.artifactstagingdirectory)" - SITE_SUFFIX: "$(SITE_SUFFIX)" - - displayName: 'Running UI Tests' - - - task: PublishTestResults@2 - condition: always() - inputs: - testResultsFiles: '$(build.sourcesdirectory)/build/TestResult-original.xml' - testRunTitle: 'WebAssembly Test Run $(SITE_SUFFIX)' - testResultsFormat: 'NUnit' - failTaskOnFailedTests: true - # This is the second run, if TestResult-original.xml is missing *and* this is a UI tests run, we fail. - failTaskOnMissingResultsFile: $(IS_UI_TESTS) - searchFolder: '$(build.artifactstagingdirectory)/screenshots/wasm-automated' # https://github.com/microsoft/azure-pipelines-tasks/issues/10072 - - - task: PublishTestResults@2 - condition: always() - inputs: - testResultsFiles: '$(build.sourcesdirectory)/build/RuntimeTestResults*.xml' - testRunTitle: 'WebAssembly Runtime Tests Run $(SITE_SUFFIX)' - testResultsFormat: 'NUnit' - failTaskOnFailedTests: true - # This is the second run, if RuntimeTestResults*.xml is missing *and* this is a runtime tests run, we fail. - failTaskOnMissingResultsFile: $(IS_RUNTIME_TESTS) - - - task: PublishBuildArtifacts@1 - condition: always() - retryCountOnTaskFailure: 3 - inputs: - PathtoPublish: $(build.artifactstagingdirectory) - ArtifactName: uitests-results - ArtifactType: Container - - - task: PublishBuildArtifacts@1 - condition: always() - retryCountOnTaskFailure: 3 - inputs: - PathtoPublish: $(build.sourcesdirectory)/build/uitests-failure-results - ArtifactName: uitests-failure-results - ArtifactType: Container diff --git a/build/ci/.azure-devops-macos.yml b/build/ci/build/.azure-devops-macos.yml similarity index 100% rename from build/ci/.azure-devops-macos.yml rename to build/ci/build/.azure-devops-macos.yml diff --git a/build/ci/.azure-devops-package-native-assets.yml b/build/ci/build/.azure-devops-package-native-assets.yml similarity index 100% rename from build/ci/.azure-devops-package-native-assets.yml rename to build/ci/build/.azure-devops-package-native-assets.yml diff --git a/build/ci/.azure-devops-package-netcoremobile.yml b/build/ci/build/.azure-devops-package-netcoremobile.yml similarity index 100% rename from build/ci/.azure-devops-package-netcoremobile.yml rename to build/ci/build/.azure-devops-package-netcoremobile.yml diff --git a/build/ci/.azure-devops-package-reference.yml b/build/ci/build/.azure-devops-package-reference.yml similarity index 100% rename from build/ci/.azure-devops-package-reference.yml rename to build/ci/build/.azure-devops-package-reference.yml diff --git a/build/ci/.azure-devops-package-skia-native-assets.yml b/build/ci/build/.azure-devops-package-skia-native-assets.yml similarity index 100% rename from build/ci/.azure-devops-package-skia-native-assets.yml rename to build/ci/build/.azure-devops-package-skia-native-assets.yml diff --git a/build/ci/.azure-devops-package-skia.yml b/build/ci/build/.azure-devops-package-skia.yml similarity index 100% rename from build/ci/.azure-devops-package-skia.yml rename to build/ci/build/.azure-devops-package-skia.yml diff --git a/build/ci/.azure-devops-package-wasm.yml b/build/ci/build/.azure-devops-package-wasm.yml similarity index 100% rename from build/ci/.azure-devops-package-wasm.yml rename to build/ci/build/.azure-devops-package-wasm.yml diff --git a/build/ci/.azure-devops-package.yml b/build/ci/build/.azure-devops-package.yml similarity index 100% rename from build/ci/.azure-devops-package.yml rename to build/ci/build/.azure-devops-package.yml diff --git a/build/ci/.azure-devops-uwp-convert.yml b/build/ci/build/.azure-devops-uwp-convert.yml similarity index 100% rename from build/ci/.azure-devops-uwp-convert.yml rename to build/ci/build/.azure-devops-uwp-convert.yml diff --git a/build/ci/.azure-devops-wasdk.yml b/build/ci/build/.azure-devops-wasdk.yml similarity index 100% rename from build/ci/.azure-devops-wasdk.yml rename to build/ci/build/.azure-devops-wasdk.yml diff --git a/build/ci/.azure-devops-docs.yml b/build/ci/docs/.azure-devops-docs.yml similarity index 100% rename from build/ci/.azure-devops-docs.yml rename to build/ci/docs/.azure-devops-docs.yml diff --git a/build/ci/.azure-devops-publish-nuget-dev.yml b/build/ci/publishing/.azure-devops-publish-nuget-dev.yml similarity index 100% rename from build/ci/.azure-devops-publish-nuget-dev.yml rename to build/ci/publishing/.azure-devops-publish-nuget-dev.yml diff --git a/build/ci/.azure-devops-publish-nuget-prod-dev.yml b/build/ci/publishing/.azure-devops-publish-nuget-prod-dev.yml similarity index 100% rename from build/ci/.azure-devops-publish-nuget-prod-dev.yml rename to build/ci/publishing/.azure-devops-publish-nuget-prod-dev.yml diff --git a/build/ci/.azure-devops-publish-nuget-prod.yml b/build/ci/publishing/.azure-devops-publish-nuget-prod.yml similarity index 100% rename from build/ci/.azure-devops-publish-nuget-prod.yml rename to build/ci/publishing/.azure-devops-publish-nuget-prod.yml diff --git a/build/ci/.azure-devops-commitsar.yml b/build/ci/setup/.azure-devops-commitsar.yml similarity index 91% rename from build/ci/.azure-devops-commitsar.yml rename to build/ci/setup/.azure-devops-commitsar.yml index 7c0b6b7d305d..1d4c32876d37 100644 --- a/build/ci/.azure-devops-commitsar.yml +++ b/build/ci/setup/.azure-devops-commitsar.yml @@ -21,4 +21,4 @@ jobs: condition: ne(variables['System.PullRequest.PullRequestNumber'], '') displayName: 'Commitsar Validation' - - template: templates/generate-changelog.yml + - template: ../templates/generate-changelog.yml diff --git a/build/ci/.azure-devops-markdown-lint.yml b/build/ci/setup/.azure-devops-markdown-lint.yml similarity index 100% rename from build/ci/.azure-devops-markdown-lint.yml rename to build/ci/setup/.azure-devops-markdown-lint.yml diff --git a/build/ci/.azure-devops-pipeline-validations.yml b/build/ci/setup/.azure-devops-pipeline-validations.yml similarity index 79% rename from build/ci/.azure-devops-pipeline-validations.yml rename to build/ci/setup/.azure-devops-pipeline-validations.yml index 7d7b9d92b023..d16eb6a07f35 100644 --- a/build/ci/.azure-devops-pipeline-validations.yml +++ b/build/ci/setup/.azure-devops-pipeline-validations.yml @@ -12,4 +12,4 @@ jobs: - checkout: self clean: true - - template: templates/gitversion-run.yml + - template: ../templates/gitversion-run.yml diff --git a/build/ci/.azure-devops-spell-check.yml b/build/ci/setup/.azure-devops-spell-check.yml similarity index 100% rename from build/ci/.azure-devops-spell-check.yml rename to build/ci/setup/.azure-devops-spell-check.yml diff --git a/build/ci/.azure-devops-android-tests.yml b/build/ci/tests/.azure-devops-android-tests.yml similarity index 100% rename from build/ci/.azure-devops-android-tests.yml rename to build/ci/tests/.azure-devops-android-tests.yml diff --git a/build/ci/.azure-devops-ios-tests-run.yml b/build/ci/tests/.azure-devops-ios-tests-run.yml similarity index 100% rename from build/ci/.azure-devops-ios-tests-run.yml rename to build/ci/tests/.azure-devops-ios-tests-run.yml diff --git a/build/ci/.azure-devops-ios-tests.yml b/build/ci/tests/.azure-devops-ios-tests.yml similarity index 100% rename from build/ci/.azure-devops-ios-tests.yml rename to build/ci/tests/.azure-devops-ios-tests.yml diff --git a/build/ci/.azure-devops-project-template-tests.yml b/build/ci/tests/.azure-devops-project-template-tests.yml similarity index 100% rename from build/ci/.azure-devops-project-template-tests.yml rename to build/ci/tests/.azure-devops-project-template-tests.yml diff --git a/build/ci/.azure-devops-screenshot-compare.yml b/build/ci/tests/.azure-devops-screenshot-compare.yml similarity index 100% rename from build/ci/.azure-devops-screenshot-compare.yml rename to build/ci/tests/.azure-devops-screenshot-compare.yml diff --git a/build/ci/.azure-devops-skia-tests.yml b/build/ci/tests/.azure-devops-skia-tests.yml similarity index 100% rename from build/ci/.azure-devops-skia-tests.yml rename to build/ci/tests/.azure-devops-skia-tests.yml diff --git a/build/ci/.azure-devops-unit-tests.yml b/build/ci/tests/.azure-devops-unit-tests.yml similarity index 100% rename from build/ci/.azure-devops-unit-tests.yml rename to build/ci/tests/.azure-devops-unit-tests.yml diff --git a/build/ci/.azure-devops-wasm-uitests.yml b/build/ci/tests/.azure-devops-wasm-tests.yml similarity index 100% rename from build/ci/.azure-devops-wasm-uitests.yml rename to build/ci/tests/.azure-devops-wasm-tests.yml