From ac52bb035cab3b3a7ed274a397f1bb1b60de82d5 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Thu, 30 Apr 2026 00:46:12 +0000 Subject: [PATCH 1/2] update --- .../templates/stages/emitter-stages.yml | 52 ------------------- .../pipelines/templates/steps/test-step.yml | 2 +- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/eng/emitters/pipelines/templates/stages/emitter-stages.yml b/eng/emitters/pipelines/templates/stages/emitter-stages.yml index 2b0a5721387..88044425eb2 100644 --- a/eng/emitters/pipelines/templates/stages/emitter-stages.yml +++ b/eng/emitters/pipelines/templates/stages/emitter-stages.yml @@ -120,21 +120,6 @@ stages: variables: selfRepositoryPath: $(Build.SourcesDirectory) jobs: - - template: /eng/emitters/pipelines/templates/jobs/build-job.yml - parameters: - BuildPrereleaseVersion: ${{ parameters.BuildPrereleaseVersion }} - UseTypeSpecNext: ${{ parameters.UseTypeSpecNext }} - Publish: ${{ parameters.Publish }} - AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }} - Packages: ${{ parameters.Packages }} - PackagePath: ${{ parameters.PackagePath }} - LanguageShortName: ${{ parameters.LanguageShortName }} - BuildArtifactName: build_artifacts_${{ parameters.LanguageShortName }} - NodeVersion: 20.x - Os: linux - EmitArtifacts: true # Emit artifacts only for the first job - PythonVersion: ${{ parameters.PythonVersion }} - RunSDLTools: true - template: /eng/emitters/pipelines/templates/jobs/build-job.yml parameters: BuildPrereleaseVersion: ${{ parameters.BuildPrereleaseVersion }} @@ -147,18 +132,6 @@ stages: NodeVersion: 22.x Os: linux PythonVersion: ${{ parameters.PythonVersion }} - - template: /eng/emitters/pipelines/templates/jobs/build-job.yml - parameters: - BuildPrereleaseVersion: ${{ parameters.BuildPrereleaseVersion }} - UseTypeSpecNext: ${{ parameters.UseTypeSpecNext }} - Publish: ${{ parameters.Publish }} - AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }} - Packages: ${{ parameters.Packages }} - PackagePath: ${{ parameters.PackagePath }} - LanguageShortName: ${{ parameters.LanguageShortName }} - NodeVersion: 20.x - Os: windows - PythonVersion: ${{ parameters.PythonVersion }} - template: /eng/emitters/pipelines/templates/jobs/build-job.yml parameters: BuildPrereleaseVersion: ${{ parameters.BuildPrereleaseVersion }} @@ -197,20 +170,6 @@ stages: buildArtifactsPath: $(Pipeline.Workspace)/build_artifacts_${{ parameters.LanguageShortName }} jobs: - ${{ if parameters.UnitTestArgs }}: - - template: /eng/emitters/pipelines/templates/jobs/test-job.yml - parameters: - AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }} - PackagePath: ${{ parameters.PackagePath }} - TestArgs: ${{ parameters.UnitTestArgs }} - LanguageShortName: ${{ parameters.LanguageShortName }} - BuildArtifactName: build_artifacts_${{ parameters.LanguageShortName }} - NodeVersion: 20.x - Os: linux - EmitArtifacts: true # Emit artifacts only for the first job - CadlRanchName: ${{ parameters.CadlRanchName }} # only needed for first job - EnableCadlRanchReport: ${{ parameters.EnableCadlRanchReport }} - PythonVersion: ${{ parameters.PythonVersion }} - UseTypeSpecNext: ${{ parameters.UseTypeSpecNext }} - template: /eng/emitters/pipelines/templates/jobs/test-job.yml parameters: AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }} @@ -222,17 +181,6 @@ stages: Os: linux PythonVersion: ${{ parameters.PythonVersion }} UseTypeSpecNext: ${{ parameters.UseTypeSpecNext }} - - template: /eng/emitters/pipelines/templates/jobs/test-job.yml - parameters: - AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }} - PackagePath: ${{ parameters.PackagePath }} - TestArgs: ${{ parameters.UnitTestArgs }} - LanguageShortName: ${{ parameters.LanguageShortName }} - BuildArtifactName: build_artifacts_${{ parameters.LanguageShortName }} - NodeVersion: 20.x - Os: windows - PythonVersion: ${{ parameters.PythonVersion }} - UseTypeSpecNext: ${{ parameters.UseTypeSpecNext }} - template: /eng/emitters/pipelines/templates/jobs/test-job.yml parameters: AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }} diff --git a/eng/emitters/pipelines/templates/steps/test-step.yml b/eng/emitters/pipelines/templates/steps/test-step.yml index f2cdf86217c..c61b148b7fe 100644 --- a/eng/emitters/pipelines/templates/steps/test-step.yml +++ b/eng/emitters/pipelines/templates/steps/test-step.yml @@ -13,7 +13,7 @@ parameters: # Node version - name: NodeVersion type: string - default: "20.x" + default: "22.x" # Arguments needed to run tests - name: TestArgs From b6ef726dd42ad8549c26f32482ba7c5b280dc9de Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Thu, 7 May 2026 00:06:06 +0000 Subject: [PATCH 2/2] update --- .../templates/stages/emitter-stages.yml | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/eng/emitters/pipelines/templates/stages/emitter-stages.yml b/eng/emitters/pipelines/templates/stages/emitter-stages.yml index 88044425eb2..e7f2ada45c0 100644 --- a/eng/emitters/pipelines/templates/stages/emitter-stages.yml +++ b/eng/emitters/pipelines/templates/stages/emitter-stages.yml @@ -120,6 +120,21 @@ stages: variables: selfRepositoryPath: $(Build.SourcesDirectory) jobs: + - template: /eng/emitters/pipelines/templates/jobs/build-job.yml + parameters: + BuildPrereleaseVersion: ${{ parameters.BuildPrereleaseVersion }} + UseTypeSpecNext: ${{ parameters.UseTypeSpecNext }} + Publish: ${{ parameters.Publish }} + AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }} + Packages: ${{ parameters.Packages }} + PackagePath: ${{ parameters.PackagePath }} + LanguageShortName: ${{ parameters.LanguageShortName }} + BuildArtifactName: build_artifacts_${{ parameters.LanguageShortName }} + NodeVersion: 24.x + Os: linux + EmitArtifacts: true # Emit artifacts only for the first job + PythonVersion: ${{ parameters.PythonVersion }} + RunSDLTools: true - template: /eng/emitters/pipelines/templates/jobs/build-job.yml parameters: BuildPrereleaseVersion: ${{ parameters.BuildPrereleaseVersion }} @@ -132,6 +147,18 @@ stages: NodeVersion: 22.x Os: linux PythonVersion: ${{ parameters.PythonVersion }} + - template: /eng/emitters/pipelines/templates/jobs/build-job.yml + parameters: + BuildPrereleaseVersion: ${{ parameters.BuildPrereleaseVersion }} + UseTypeSpecNext: ${{ parameters.UseTypeSpecNext }} + Publish: ${{ parameters.Publish }} + AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }} + Packages: ${{ parameters.Packages }} + PackagePath: ${{ parameters.PackagePath }} + LanguageShortName: ${{ parameters.LanguageShortName }} + NodeVersion: 24.x + Os: windows + PythonVersion: ${{ parameters.PythonVersion }} - template: /eng/emitters/pipelines/templates/jobs/build-job.yml parameters: BuildPrereleaseVersion: ${{ parameters.BuildPrereleaseVersion }} @@ -170,6 +197,20 @@ stages: buildArtifactsPath: $(Pipeline.Workspace)/build_artifacts_${{ parameters.LanguageShortName }} jobs: - ${{ if parameters.UnitTestArgs }}: + - template: /eng/emitters/pipelines/templates/jobs/test-job.yml + parameters: + AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }} + PackagePath: ${{ parameters.PackagePath }} + TestArgs: ${{ parameters.UnitTestArgs }} + LanguageShortName: ${{ parameters.LanguageShortName }} + BuildArtifactName: build_artifacts_${{ parameters.LanguageShortName }} + NodeVersion: 24.x + Os: linux + EmitArtifacts: true # Emit artifacts only for the first job + CadlRanchName: ${{ parameters.CadlRanchName }} # only needed for first job + EnableCadlRanchReport: ${{ parameters.EnableCadlRanchReport }} + PythonVersion: ${{ parameters.PythonVersion }} + UseTypeSpecNext: ${{ parameters.UseTypeSpecNext }} - template: /eng/emitters/pipelines/templates/jobs/test-job.yml parameters: AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }} @@ -181,6 +222,17 @@ stages: Os: linux PythonVersion: ${{ parameters.PythonVersion }} UseTypeSpecNext: ${{ parameters.UseTypeSpecNext }} + - template: /eng/emitters/pipelines/templates/jobs/test-job.yml + parameters: + AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }} + PackagePath: ${{ parameters.PackagePath }} + TestArgs: ${{ parameters.UnitTestArgs }} + LanguageShortName: ${{ parameters.LanguageShortName }} + BuildArtifactName: build_artifacts_${{ parameters.LanguageShortName }} + NodeVersion: 24.x + Os: windows + PythonVersion: ${{ parameters.PythonVersion }} + UseTypeSpecNext: ${{ parameters.UseTypeSpecNext }} - template: /eng/emitters/pipelines/templates/jobs/test-job.yml parameters: AdditionalInitializeSteps: ${{ parameters.AdditionalInitializeSteps }}