From ba6f666cef4eda36bd836d5448be03f034981c4d Mon Sep 17 00:00:00 2001 From: Pratik Golchha Date: Thu, 5 Dec 2024 14:32:41 -0800 Subject: [PATCH 1/5] Updated official-build.yml file --- eng/ci/official-build.yml | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml index 776d587e..4b5718d7 100644 --- a/eng/ci/official-build.yml +++ b/eng/ci/official-build.yml @@ -30,6 +30,9 @@ resources: variables: - template: ci/variables/build.yml@eng - template: ci/variables/cfs.yml@eng + - codeql.language: java,powershell + - codeql.buildIdentifier: java_worker_official + - codeql.excludePathPatterns: 'extract/inst' extends: template: v1/1ES.Official.PipelineTemplate.yml@1es @@ -41,35 +44,16 @@ extends: stages: - stage: Build - templateContext: - sdl: - codeql: - language: java,powershell - runSourceLanguagesInSourceAnalysis: true - buildIdentifier: java_worker_official - excludePathPatterns: '/extract/inst' jobs: - template: /eng/ci/templates/official/jobs/build-artifacts.yml@self - stage: TestWindows dependsOn: Build - templateContext: - sdl: - codeql: - language: csharp - buildIdentifier: java_worker_csharp_official - excludePathPatterns: '/extract/inst' jobs: - template: /eng/ci/templates/official/jobs/run-e2e-tests-windows.yml@self - stage: TestLinux dependsOn: - TestWindows - templateContext: - sdl: - codeql: - compiled: - enabled: false - justificationForDisabling: 'Running the scan in TestWindows stage' jobs: - template: /eng/ci/templates/official/jobs/run-e2e-tests-linux.yml@self From faa43f53244632f61dd3651f2ad46c7ead7dad67 Mon Sep 17 00:00:00 2001 From: Pratik Golchha Date: Thu, 5 Dec 2024 14:33:05 -0800 Subject: [PATCH 2/5] Updated public-build.yml file --- eng/ci/public-build.yml | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml index 6d695643..12fb52be 100644 --- a/eng/ci/public-build.yml +++ b/eng/ci/public-build.yml @@ -24,6 +24,11 @@ resources: name: 1ESPipelineTemplates/1ESPipelineTemplates ref: refs/tags/release +variables: + - codeql.language: java,powershell + - codeql.buildIdentifier: java_worker_official + - codeql.excludePathPatterns: 'extract/inst' + extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1es parameters: @@ -38,35 +43,16 @@ extends: stages: - stage: Build - templateContext: - sdl: - codeql: - language: java,powershell - buildIdentifier: java_worker_public - excludePathPatterns: '/extract/inst' - runSourceLanguagesInSourceAnalysis: true jobs: - template: /eng/ci/templates/jobs/build.yml@self - stage: TestWindows dependsOn: Build - templateContext: - sdl: - codeql: - language: csharp - buildIdentifier: java_worker_csharp_public - excludePathPatterns: '/extract/inst' jobs: - template: /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self - stage: TestLinux dependsOn: - TestWindows - templateContext: - sdl: - codeql: - compiled: - enabled: false - justificationForDisabling: 'Running the scan in TestWindows stage' jobs: - template: /eng/ci/templates/jobs/run-emulated-tests-linux.yml@self From bcb440b692e4ba9af809f2ab461a8b97993ff8bb Mon Sep 17 00:00:00 2001 From: Pratik Golchha Date: Thu, 5 Dec 2024 15:05:31 -0800 Subject: [PATCH 3/5] Update public-build.yml --- eng/ci/public-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml index 12fb52be..9f08d43f 100644 --- a/eng/ci/public-build.yml +++ b/eng/ci/public-build.yml @@ -26,7 +26,7 @@ resources: variables: - codeql.language: java,powershell - - codeql.buildIdentifier: java_worker_official + - codeql.buildIdentifier: java_worker_public - codeql.excludePathPatterns: 'extract/inst' extends: From 5ff8fb516b845ffea821164d9e2b08738ac5e215 Mon Sep 17 00:00:00 2001 From: Pratik Golchha Date: Thu, 5 Dec 2024 15:06:16 -0800 Subject: [PATCH 4/5] Update official-build.yml --- eng/ci/official-build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml index 4b5718d7..bdb9893f 100644 --- a/eng/ci/official-build.yml +++ b/eng/ci/official-build.yml @@ -30,9 +30,12 @@ resources: variables: - template: ci/variables/build.yml@eng - template: ci/variables/cfs.yml@eng - - codeql.language: java,powershell - - codeql.buildIdentifier: java_worker_official - - codeql.excludePathPatterns: 'extract/inst' + - name: codeql.language + value: java,powershell + - name: codeql.buildIdentifier + value: java_worker_official + - name: codeql.excludePathPatterns + value: extract/inst extends: template: v1/1ES.Official.PipelineTemplate.yml@1es From 58d5de52827c32e89abeba8ef476e68daad6169c Mon Sep 17 00:00:00 2001 From: Pratik Golchha Date: Thu, 5 Dec 2024 15:06:45 -0800 Subject: [PATCH 5/5] Update public-build.yml --- eng/ci/public-build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml index 9f08d43f..cea62eba 100644 --- a/eng/ci/public-build.yml +++ b/eng/ci/public-build.yml @@ -25,9 +25,12 @@ resources: ref: refs/tags/release variables: - - codeql.language: java,powershell - - codeql.buildIdentifier: java_worker_public - - codeql.excludePathPatterns: 'extract/inst' + - name: codeql.language + value: java,powershell + - name: codeql.buildIdentifier + value: java_worker_public + - name: codeql.excludePathPatterns + value: extract/inst extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1es