Skip to content

Commit 80f1768

Browse files
committed
Use new LinuxContainerImage and enable binskim globally
1 parent 0acf054 commit 80f1768

File tree

11 files changed

+7
-21
lines changed

11 files changed

+7
-21
lines changed

.pipelines/Build-Official.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ variables:
2828
- name: BUILDSECMON_OPT_IN
2929
value: true
3030
- name: LinuxContainerImage
31-
value: mcr.microsoft.com/onebranch/cbl-mariner/build:2.0
31+
value: mcr.microsoft.com/onebranch/azurelinux/build:3.0
3232
- name: WindowsContainerImage
3333
value: onebranch.azurecr.io/windows/ltsc2022/vse2022:latest
3434
- name: CDP_DEFINITION_BUILD_COUNT
@@ -68,7 +68,8 @@ extends:
6868
enabled: true
6969
scanFolder: $(Build.SourcesDirectory)
7070
binskim:
71-
enabled: false
71+
enabled: true
72+
exactToolVersion: 4.4.2
7273
apiscan:
7374
enabled: false
7475
tsaOptionsFile: .config\tsaoptions.json

.pipelines/Package-Official.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ variables:
1818
- name: WindowsContainerImage
1919
value: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest' # Docker image which is used to build the project
2020
- name: LinuxContainerImage
21-
value: mcr.microsoft.com/onebranch/cbl-mariner/build:2.0
21+
value: mcr.microsoft.com/onebranch/azurelinux/build:3.0
2222
- group: mscodehub-feed-read-general
2323
- group: mscodehub-feed-read-akv
2424
- name: branchCounterKey
@@ -71,7 +71,8 @@ extends:
7171
enabled: true
7272
scanFolder: $(Build.SourcesDirectory)
7373
binskim:
74-
enabled: false
74+
enabled: true
75+
exactToolVersion: 4.4.2
7576
apiscan:
7677
enabled: false
7778
tsaOptionsFile: .config\tsaoptions.json

.pipelines/Release-Official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ variables:
2020
- name: WindowsContainerImage
2121
value: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
2222
- name: LinuxContainerImage
23-
value: mcr.microsoft.com/onebranch/cbl-mariner/build:2.0
23+
value: mcr.microsoft.com/onebranch/azurelinux/build:3.0
2424

2525
resources:
2626
repositories:

.pipelines/templates/linux-build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
value: false
2222
- name: ob_sdl_codeSignValidation_enabled
2323
value: false
24-
- name: ob_sdl_binskim_enabled
25-
value: true
2624
- name: ob_sdl_tsa_configFile
2725
value: $(repoRoot)\.config\tsaoptions.json
2826
- name: Architecture

.pipelines/templates/linux-package.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ jobs:
2626
value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
2727
- name: repoRoot
2828
value: $(Build.SourcesDirectory)/AIShell
29-
- name: ob_sdl_binskim_enabled
30-
value: true
3129
- name: ob_sdl_tsa_configFile
3230
value: $(repoRoot)/.config/tsaoptions.json
3331
- name: Architecture

.pipelines/templates/mac-package.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ jobs:
2929
value: false
3030
- name: ob_outputDirectory
3131
value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
32-
- name: ob_sdl_binskim_enabled
33-
value: true
3432
- name: repoRoot
3533
value: $(Build.SourcesDirectory)
3634
- name: Architecture

.pipelines/templates/module-build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ jobs:
1818
value: false
1919
- name: ob_sdl_codeSignValidation_enabled
2020
value: false
21-
- name: ob_sdl_binskim_enabled
22-
value: true
2321
- name: ob_sdl_tsa_configFile
2422
value: $(repoRoot)\.config\tsaoptions.json
2523
#CodeQL tasks added manually to workaround signing failures

.pipelines/templates/module-package.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT'
2323
- name: repoRoot
2424
value: $(Build.SourcesDirectory)/AIShell
25-
- name: ob_sdl_binskim_enabled
26-
value: true
2725
- name: ob_sdl_tsa_configFile
2826
value: $(repoRoot)/.config/tsaoptions.json
2927
- name: ob_signing_setup_enabled

.pipelines/templates/nupkg-package.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ jobs:
1818
value: '$(Build.ArtifactStagingDirectory)\ONEBRANCH_ARTIFACT'
1919
- name: repoRoot
2020
value: $(Build.SourcesDirectory)\AIShell
21-
- name: ob_sdl_binskim_enabled
22-
value: true
2321
- name: ob_sdl_tsa_configFile
2422
value: $(repoRoot)\.config\tsaoptions.json
2523
- group: mscodehub-feed-read-general

.pipelines/templates/windows-build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
value: $(Build.SourcesDirectory)\AIShell
2121
- name: ob_sdl_codeSignValidation_enabled
2222
value: false
23-
- name: ob_sdl_binskim_enabled
24-
value: true
2523
- name: ob_sdl_tsa_configFile
2624
value: $(repoRoot)\.config\tsaoptions.json
2725
- name: Architecture

0 commit comments

Comments
 (0)