Skip to content

fix: specify codeql variable config as per 1ES PT variables #795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 15, 2024
Merged

fix: specify codeql variable config as per 1ES PT variables #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4180bd
specify codeql as per 1es pt vars
manvkaur Nov 15, 2024
b11e564
remove vars
manvkaur Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions eng/ci/official-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,31 @@ extends:

stages:
- stage: Build
variables:
Codeql.Language: java,powershell
Codeql.RunSourceLanguagesInSourceAnalysis: true
templateContext:
sdl:
codeql:
language: java,powershell
runSourceLanguagesInSourceAnalysis: true
jobs:
- template: /eng/ci/templates/official/jobs/build-artifacts.yml@self

- stage: TestWindows
dependsOn: Build
variables:
Codeql.Language: csharp
templateContext:
sdl:
codeql:
language: csharp
jobs:
- template: /eng/ci/templates/official/jobs/run-e2e-tests-windows.yml@self

- stage: TestLinux
dependsOn:
- TestWindows
variables:
Codeql.Enabled: false
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
28 changes: 15 additions & 13 deletions eng/ci/public-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,35 +32,37 @@ extends:
image: 1es-windows-2022
os: windows

sdl:
codeql:
compiled:
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:
Codeql.Language: java,powershell
Codeql.RunSourceLanguagesInSourceAnalysis: true
templateContext:
sdl:
codeql:
language: java,powershell
runSourceLanguagesInSourceAnalysis: true
jobs:
- template: /eng/ci/templates/jobs/build.yml@self

- stage: TestWindows
dependsOn: Build
variables:
Codeql.Language: csharp
templateContext:
sdl:
codeql:
language: csharp
jobs:
- template: /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self

- stage: TestLinux
dependsOn:
- TestWindows
variables:
Codeql.Enabled: false
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