From 65345b379b7dc132a8631b61ac73a6749315814e Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 28 Aug 2025 11:20:54 -0700 Subject: [PATCH 1/6] Add missing r --- .azure/pipelines/ci-unofficial.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci-unofficial.yml b/.azure/pipelines/ci-unofficial.yml index e0b5a80f8f09..a92496e5cfd7 100644 --- a/.azure/pipelines/ci-unofficial.yml +++ b/.azure/pipelines/ci-unofficial.yml @@ -75,7 +75,7 @@ variables: exclude:artifacts - template: /eng/common/templates-official/variables/pool-providers.yml@self -esources: +resources: repositories: # Repo: 1ESPipelineTemplates/1ESPipelineTemplates - repository: 1esPipelines From e515e56632f832f8e3c5d69cbbe3f882522c588c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 28 Aug 2025 12:28:09 -0700 Subject: [PATCH 2/6] Try something --- .azure/pipelines/ci-unofficial.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.azure/pipelines/ci-unofficial.yml b/.azure/pipelines/ci-unofficial.yml index a92496e5cfd7..7feeba947cda 100644 --- a/.azure/pipelines/ci-unofficial.yml +++ b/.azure/pipelines/ci-unofficial.yml @@ -97,6 +97,11 @@ extends: enabled: true tsa: enabled: true + templateContext: + inputs: + - input: checkout + repository: self + submodules: true containers: azureLinux30Net10BuildAmd64: image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64 From 0a1dee37710498ebd9a39a5e5e3ab47fc5e35c5b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 28 Aug 2025 12:30:37 -0700 Subject: [PATCH 3/6] options --- .azure/pipelines/ci-unofficial.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.azure/pipelines/ci-unofficial.yml b/.azure/pipelines/ci-unofficial.yml index 7feeba947cda..73ff6873cd1d 100644 --- a/.azure/pipelines/ci-unofficial.yml +++ b/.azure/pipelines/ci-unofficial.yml @@ -97,11 +97,8 @@ extends: enabled: true tsa: enabled: true - templateContext: - inputs: - - input: checkout - repository: self - submodules: true + repositoryCheckoutOptions: + submodules: true containers: azureLinux30Net10BuildAmd64: image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64 From 2cba05ff75398033d955d2f14b4c1bff5279b7b3 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 28 Aug 2025 12:31:41 -0700 Subject: [PATCH 4/6] git --- .azure/pipelines/ci-unofficial.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci-unofficial.yml b/.azure/pipelines/ci-unofficial.yml index 73ff6873cd1d..0076630ec1ed 100644 --- a/.azure/pipelines/ci-unofficial.yml +++ b/.azure/pipelines/ci-unofficial.yml @@ -97,7 +97,7 @@ extends: enabled: true tsa: enabled: true - repositoryCheckoutOptions: + git: submodules: true containers: azureLinux30Net10BuildAmd64: From 748faa41f852bf43c6a03f79c38fb763aead22f7 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 28 Aug 2025 12:40:10 -0700 Subject: [PATCH 5/6] Undo --- .azure/pipelines/ci-unofficial.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.azure/pipelines/ci-unofficial.yml b/.azure/pipelines/ci-unofficial.yml index 0076630ec1ed..a92496e5cfd7 100644 --- a/.azure/pipelines/ci-unofficial.yml +++ b/.azure/pipelines/ci-unofficial.yml @@ -97,8 +97,6 @@ extends: enabled: true tsa: enabled: true - git: - submodules: true containers: azureLinux30Net10BuildAmd64: image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64 From 21e1e58e81445798999eb510dc112be454d5db37 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 28 Aug 2025 13:13:54 -0700 Subject: [PATCH 6/6] Fixup --- .azure/pipelines/ci-unofficial.yml | 60 +++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/.azure/pipelines/ci-unofficial.yml b/.azure/pipelines/ci-unofficial.yml index a92496e5cfd7..daa5311bdc27 100644 --- a/.azure/pipelines/ci-unofficial.yml +++ b/.azure/pipelines/ci-unofficial.yml @@ -111,6 +111,9 @@ extends: jobName: Code_check jobDisplayName: Code check agentOs: Windows + beforeBuild: + - script: git submodule update --init + displayName: Update submodules steps: - powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs) displayName: Run eng/scripts/CodeCheck.ps1 @@ -127,6 +130,9 @@ extends: jobName: Windows_build jobDisplayName: "Build: Windows x64/x86/arm64" agentOs: Windows + beforeBuild: + - script: git submodule update --init + displayName: Update submodules steps: - ${{ if notIn(variables['Build.Reason'], 'PullRequest') }}: - script: echo "##vso[build.addbuildtag]daily-build" @@ -258,6 +264,9 @@ extends: jobDisplayName: "Build: macOS arm64" agentOs: macOs timeoutInMinutes: 90 + beforeBuild: + - script: git submodule update --init + displayName: Update submodules buildArgs: --arch arm64 --pack @@ -289,6 +298,9 @@ extends: jobDisplayName: "Build: macOS x64" agentOs: macOs timeoutInMinutes: 90 + beforeBuild: + - script: git submodule update --init + displayName: Update submodules buildArgs: --pack --all @@ -319,6 +331,9 @@ extends: jobDisplayName: "Build: Linux x64" agentOs: Linux useHostedUbuntu: false + beforeBuild: + - script: git submodule update --init + displayName: Update submodules buildArgs: --arch x64 --pack @@ -350,6 +365,9 @@ extends: jobName: Linux_arm_build jobDisplayName: "Build: Linux ARM" agentOs: Linux + beforeBuild: + - script: git submodule update --init + displayName: Update submodules buildArgs: --arch arm --pack @@ -380,6 +398,9 @@ extends: jobName: Linux_arm64_build jobDisplayName: "Build: Linux ARM64" agentOs: Linux + beforeBuild: + - script: git submodule update --init + displayName: Update submodules buildArgs: --arch arm64 --pack @@ -412,6 +433,9 @@ extends: jobDisplayName: "Build: Linux Musl x64" agentOs: Linux container: azureLinux30Net10BuildAmd64 + beforeBuild: + - script: git submodule update --init + displayName: Update submodules buildArgs: --arch x64 --os-name linux-musl @@ -446,6 +470,9 @@ extends: agentOs: Linux useHostedUbuntu: false container: azureLinux30Net10BuildAmd64 + beforeBuild: + - script: git submodule update --init + displayName: Update submodules buildArgs: --arch arm --os-name linux-musl @@ -479,6 +506,9 @@ extends: agentOs: Linux useHostedUbuntu: false container: azureLinux30Net10BuildAmd64 + beforeBuild: + - script: git submodule update --init + displayName: Update submodules buildArgs: --arch arm64 --os-name linux-musl @@ -517,6 +547,8 @@ extends: /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunBlazorPlaywrightTemplateTests=true /p:DoNotCleanUpTemplates=true $(_InternalRuntimeDownloadArgs) beforeBuild: + - script: git submodule update --init + displayName: Update submodules - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1" displayName: Setup IISExpress test certificates and schema artifacts: @@ -540,6 +572,8 @@ extends: isAzDOTestingJob: true buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs) beforeBuild: + - script: git submodule update --init + displayName: Update submodules - bash: "./eng/scripts/install-nginx-mac.sh" displayName: Installing Nginx artifacts: @@ -561,6 +595,8 @@ extends: useHostedUbuntu: false buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs) beforeBuild: + - script: git submodule update --init + displayName: Update submodules - bash: "./eng/scripts/install-nginx-linux.sh" displayName: Installing Nginx - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p" @@ -582,6 +618,9 @@ extends: jobDisplayName: 'Tests: Helix x64 Subset 1' agentOs: Windows timeoutInMinutes: 240 + beforeBuild: + - script: git submodule update --init + displayName: Update submodules steps: # Build the shared framework - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64 @@ -611,6 +650,9 @@ extends: jobDisplayName: 'Tests: Helix x64 Subset 2' agentOs: Windows timeoutInMinutes: 240 + beforeBuild: + - script: git submodule update --init + displayName: Update submodules steps: # Build the shared framework - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64 @@ -642,6 +684,9 @@ extends: agentOs: Windows isAzDOTestingJob: true timeoutInMinutes: 240 + beforeBuild: + - script: git submodule update --init + displayName: Update submodules steps: - script: git submodule update --init displayName: Update submodules @@ -670,17 +715,4 @@ extends: path: artifacts/log/ publishOnError: true includeForks: true - # Source build - - template: /eng/common/templates-official/job/source-build.yml@self - parameters: - enableInternalSources: true - platform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64' - buildScript: './eng/build.sh' - buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)' - jobProperties: - timeoutInMinutes: 120 - variables: - # Log environment variables in binary logs to ease debugging - MSBUILDLOGALLENVIRONMENTVARIABLES: true +