From ca5200bb4f61365b5b98bc5db9427abbdc951f7d Mon Sep 17 00:00:00 2001 From: manvkaur <67894494+manvkaur@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:51:48 -0800 Subject: [PATCH 1/3] fix codeql and indentation --- eng/ci/official-build.yml | 70 +++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml index 12e6f64e..5cc50cf2 100644 --- a/eng/ci/official-build.yml +++ b/eng/ci/official-build.yml @@ -1,31 +1,31 @@ schedules: -- cron: "0 20 * * *" - displayName: Nightly Build - branches: - include: - - dev - always: true + - cron: '0 20 * * *' + displayName: Nightly Build + branches: + include: + - dev + always: true trigger: batch: true branches: include: - - dev - - release/* # azure-functions-java-worker github repo restricts creation of release/* branches, so using a pattern is safe here. + - dev + - release/* # azure-functions-java-worker github repo restricts creation of release/* branches, so using a pattern is safe here. # CI only, does not trigger on PRs. pr: none resources: repositories: - - repository: 1es - type: git - name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release - - repository: eng - type: git - name: engineering - ref: refs/tags/release + - repository: 1es + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + - repository: eng + type: git + name: engineering + ref: refs/tags/release variables: - template: ci/variables/build.yml@eng @@ -40,20 +40,24 @@ extends: os: windows stages: - - stage: Build - - jobs: - - template: /eng/ci/templates/official/jobs/build-artifacts.yml@self - - - stage: TestWindows - dependsOn: Build - - jobs: - - template: /eng/ci/templates/official/jobs/run-e2e-tests-windows.yml@self - - - stage: TestLinux - dependsOn: - - TestWindows - - jobs: - - template: /eng/ci/templates/official/jobs/run-e2e-tests-linux.yml@self + - stage: Build + variables: + Codeql.Language: java,powershell + Codeql.RunSourceLanguagesInSourceAnalysis: true + jobs: + - template: /eng/ci/templates/official/jobs/build-artifacts.yml@self + + - stage: TestWindows + dependsOn: Build + variables: + Codeql.Language: csharp + jobs: + - template: /eng/ci/templates/official/jobs/run-e2e-tests-windows.yml@self + + - stage: TestLinux + dependsOn: + - TestWindows + variables: + Codeql.Enabled: false + jobs: + - template: /eng/ci/templates/official/jobs/run-e2e-tests-linux.yml@self From 4ea4bada26d692c4ac1ec1f473776057ec8545e2 Mon Sep 17 00:00:00 2001 From: manvkaur <67894494+manvkaur@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:58:39 -0800 Subject: [PATCH 2/3] update public build also --- eng/ci/public-build.yml | 67 ++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml index b12724d3..ed1fb455 100644 --- a/eng/ci/public-build.yml +++ b/eng/ci/public-build.yml @@ -1,28 +1,28 @@ schedules: -- cron: "0 0 * * *" - displayName: Nightly Build - branches: - include: - - dev - always: true + - cron: '0 0 * * *' + displayName: Nightly Build + branches: + include: + - dev + always: true trigger: batch: true branches: include: - - dev + - dev pr: branches: include: - - dev + - dev resources: repositories: - - repository: 1es - type: git - name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release + - repository: 1es + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1es @@ -34,24 +34,29 @@ extends: sdl: codeql: - compiled: - enabled: true - runSourceLanguagesInSourceAnalysis: true + compiled: + enabled: true + runSourceLanguagesInSourceAnalysis: true stages: - - stage: Build - - jobs: - - template: /eng/ci/templates/jobs/build.yml@self - - stage: TestWindows - dependsOn: Build - - jobs: - - template: /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self - - - stage: TestLinux - dependsOn: - - TestWindows - - jobs: - - template: /eng/ci/templates/jobs/run-emulated-tests-linux.yml@self + - stage: Build + variables: + Codeql.Language: java,powershell + Codeql.RunSourceLanguagesInSourceAnalysis: true + jobs: + - template: /eng/ci/templates/jobs/build.yml@self + + - stage: TestWindows + dependsOn: Build + variables: + Codeql.Language: csharp + jobs: + - template: /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self + + - stage: TestLinux + dependsOn: + - TestWindows + variables: + Codeql.Enabled: false + jobs: + - template: /eng/ci/templates/jobs/run-emulated-tests-linux.yml@self From 6ff705c61c3b57eb333d54b79de5588ddc20cff2 Mon Sep 17 00:00:00 2001 From: manvkaur <67894494+manvkaur@users.noreply.github.com> Date: Thu, 14 Nov 2024 14:08:18 -0800 Subject: [PATCH 3/3] skip build tags for fork PRs --- eng/ci/public-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml index ed1fb455..88073c66 100644 --- a/eng/ci/public-build.yml +++ b/eng/ci/public-build.yml @@ -38,6 +38,10 @@ extends: enabled: true runSourceLanguagesInSourceAnalysis: true + settings: + # PR's from forks do not have sufficient permissions to set tags. + skipBuildTagsForGitHubPullRequests: ${{ variables['System.PullRequest.IsFork'] }} + stages: - stage: Build variables: