Skip to content

Commit 1743c7f

Browse files
ericstjdirecthexMerlinBotmichaelgsharp
authored
[release/3.0] pipeline fixes (#7063)
* Change official build to use 1ES templates (#7048) With any luck this doesn't break our builds (official build tests have been done from a branch) * Updated for https://dev.azure.com/dnceng/7ea9116e-9fac-403d-b258-b31fcf1bb293/_build?definitionId=1110 by using baselines generated in https://dev.azure.com/dnceng/7ea9116e-9fac-403d-b258-b31fcf1bb293/_build/results?buildId=2396001 (#7051) Co-authored-by: MerlinBot <[email protected]> * testing arm python brew overwite (#7058) * testing arm python brew overwite * more m1 testing * Install [email protected] before libomp * Update official build libomp install command --------- Co-authored-by: Eric StJohn <[email protected]> --------- Co-authored-by: Jo Shields <[email protected]> Co-authored-by: MerlinBot <[email protected]> Co-authored-by: Michael Sharp <[email protected]>
1 parent 725abb5 commit 1743c7f

File tree

12 files changed

+463
-304
lines changed

12 files changed

+463
-304
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2+
3+
pipelines:
4+
1110:
5+
retail:
6+
binary:
7+
credscan:
8+
lastModifiedDate: 2024-03-06
9+
binskim:
10+
lastModifiedDate: 2024-03-06
11+
spotbugs:
12+
lastModifiedDate: 2024-03-06
13+
source:
14+
credscan:
15+
lastModifiedDate: 2024-03-06
16+
eslint:
17+
lastModifiedDate: 2024-03-06
18+
psscriptanalyzer:
19+
lastModifiedDate: 2024-03-06
20+
armory:
21+
lastModifiedDate: 2024-03-06

‎.config/guardian/.gdnbaselines‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{
2+
"properties": {
3+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
4+
},
5+
"version": "1.0.0",
6+
"baselines": {
7+
"default": {
8+
"name": "default",
9+
"createdDate": "2024-03-06 21:08:31Z",
10+
"lastUpdatedDate": "2024-03-06 21:08:31Z"
11+
}
12+
},
13+
"results": {
14+
"31128318971be3d77cbd3aaf7b6a06d65b1874334a143ee500c7fccb5aa89427": {
15+
"signature": "31128318971be3d77cbd3aaf7b6a06d65b1874334a143ee500c7fccb5aa89427",
16+
"alternativeSignatures": [
17+
"9106dc3b9a335702dc4feeeed54285f07d8a06494f38fc23167f6158793928dc"
18+
],
19+
"target": "eng/common/SetupNugetSources.ps1",
20+
"line": 38,
21+
"memberOf": [
22+
"default"
23+
],
24+
"tool": "psscriptanalyzer",
25+
"ruleId": "PSAvoidUsingUsernameAndPasswordParams",
26+
"createdDate": "2024-03-06 21:08:31Z",
27+
"expirationDate": "2024-08-23 23:30:43Z",
28+
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-06 23:30:43Z"
29+
},
30+
"992b26983b997813a410dfc25048f3b218c6fc02fc14a5c2ad431ec8e022ac79": {
31+
"signature": "992b26983b997813a410dfc25048f3b218c6fc02fc14a5c2ad431ec8e022ac79",
32+
"alternativeSignatures": [
33+
"23e97da32b7142c282727c96d07fd5ce6aefd6ef26f02e91cb471eb7863542f8"
34+
],
35+
"target": "eng/common/SetupNugetSources.ps1",
36+
"line": 56,
37+
"memberOf": [
38+
"default"
39+
],
40+
"tool": "psscriptanalyzer",
41+
"ruleId": "PSAvoidUsingUsernameAndPasswordParams",
42+
"createdDate": "2024-03-06 21:08:31Z",
43+
"expirationDate": "2024-08-23 23:30:43Z",
44+
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-06 23:30:43Z"
45+
},
46+
"53b10a5fb6059b0b229ad32c6278123a5603386f65d9e1c5684a2333f2e1dc62": {
47+
"signature": "53b10a5fb6059b0b229ad32c6278123a5603386f65d9e1c5684a2333f2e1dc62",
48+
"alternativeSignatures": [
49+
"cd7b0b0937cfa32a98962a528bd99ede0181ae41a609df430f35fd30763166c4"
50+
],
51+
"target": "eng/common/SetupNugetSources.ps1",
52+
"line": 88,
53+
"memberOf": [
54+
"default"
55+
],
56+
"tool": "psscriptanalyzer",
57+
"ruleId": "PSAvoidUsingUsernameAndPasswordParams",
58+
"createdDate": "2024-03-06 21:08:31Z",
59+
"expirationDate": "2024-08-23 23:30:43Z",
60+
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-06 23:30:43Z"
61+
},
62+
"2c5f3fa8b37f6dfb1ec7cb1bc64d39a43a9a0184f317d7bd5811d734da9c8626": {
63+
"signature": "2c5f3fa8b37f6dfb1ec7cb1bc64d39a43a9a0184f317d7bd5811d734da9c8626",
64+
"alternativeSignatures": [
65+
"795ef944edceb1b07d6dd64cd3cc30a0d4d874a6dc6f5bc6f6834d2cdcef5e75"
66+
],
67+
"target": "artifacts/pkgassets/Microsoft.ML.Mkl.Redist/runtimes/win-x86/native/MklImports.dll",
68+
"memberOf": [
69+
"default"
70+
],
71+
"tool": "binskim",
72+
"ruleId": "BA2008",
73+
"createdDate": "2024-03-06 21:13:53Z",
74+
"expirationDate": "2024-08-23 23:30:43Z",
75+
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-06 23:30:43Z"
76+
},
77+
"17d4115eadce781703d1e090f3c05e73f84fbbab513a1d4c8cd60b54dc8efe8c": {
78+
"signature": "17d4115eadce781703d1e090f3c05e73f84fbbab513a1d4c8cd60b54dc8efe8c",
79+
"alternativeSignatures": [
80+
"be452f644ec14427721109f8264e8074b2a0276ec71a0cd72e41ccbe33094c7f"
81+
],
82+
"target": "artifacts/pkgassets/Microsoft.ML.Mkl.Redist/runtimes/win-x64/native/MklImports.dll",
83+
"memberOf": [
84+
"default"
85+
],
86+
"tool": "binskim",
87+
"ruleId": "BA2008",
88+
"createdDate": "2024-03-06 21:36:33Z",
89+
"expirationDate": "2024-08-23 23:30:43Z",
90+
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-06 23:30:43Z"
91+
}
92+
}
93+
}

‎.vsts-dotnet-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
innerLoop: true
128128
pool:
129129
vmImage: macOS-12
130-
helixQueue: OSX.1100.Arm64.Open
130+
helixQueue: OSX.1200.Arm64.Open
131131

132132
- template: /build/ci/job-template.yml
133133
parameters:

‎build/ci/job-template.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
displayName: Install MacOS build dependencies
7272
# Extra Apple MacOS step required to install OS-specific dependencies
7373
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}:
74-
- script: brew update && brew install libomp && brew link libomp --force
74+
- script: brew update && brew install -f --overwrite [email protected] && brew install libomp && brew link libomp --force
7575
displayName: Install MacOS ARM build dependencies
7676
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}:
7777
- bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH"

0 commit comments

Comments
 (0)