Skip to content

Commit 96430e6

Browse files
josesimoesjosesimoes
authored
Work CI-CD (#3253)
***NO_CI***
1 parent 2f9ddd4 commit 96430e6

File tree

3 files changed

+107
-97
lines changed

3 files changed

+107
-97
lines changed

‎azure-pipelines-nightly.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
echo "##vso[task.setvariable variable=BUILD_ESP32;isOutput=true]false"
104104
echo "##vso[task.setvariable variable=BUILD_TI;isOutput=true]false"
105105
echo "##vso[task.setvariable variable=BUILD_AZURERTOS;isOutput=true]false"
106-
echo "##vso[task.setvariable variable=BUILD_ALL;isOutput=true]false"
106+
echo "##vso[task.setvariable variable=BUILD_ALL;isOutput=true]false"
107107
108108
if($env:StartReleaseCandidate -like "true")
109109
{
@@ -162,9 +162,8 @@ jobs:
162162
163163
if($buildingPr)
164164
{
165-
# ChibiOS targets are the only ones needing to be build on a global change
166-
echo "##vso[task.setvariable variable=BUILD_CHIBIOS;isOutput=true]true"
167-
Write-host "##[command] Building ChibiOS targets"
165+
# PR build, and only changes at global folders, no need to build all targets
166+
Write-host "##[command] Changes at global folders, therefore no need to build all targets"
168167
}
169168
else
170169
{

‎azure-pipelines-templates/check-mscorlib-to-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ steps:
3131
# look for test prompt in PR commit message
3232
# pattern is "Tested against nanoframework/CoreLibrary#NNNN"
3333
34-
if($prCommitMessage -match "Tested against nanoframework/CoreLibrary#(\d+)")
34+
if($prCommitMessage -match "\[tested against nanoframework/CoreLibrary#(\d+)\]")
3535
{
3636
$testPR = $matches[1]
3737
"Test PR found: $testPR" | Write-Host -ForegroundColor White

‎azure-pipelines.yml‎

Lines changed: 103 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ jobs:
118118
}
119119
120120
# grab PR commit message
121-
$prCommitMessage = $($pr.body)
121+
# $prCommitMessage = $($pr.body)
122122
123123
# debug output
124124
# echo "=====`r`n$($prCommitMessage)`r`n====="
125125
126126
# check if Unit Tests for mscorlib should be run
127-
if(($prCommitMessage -like "*[run mscorlib tests]*") -or ($prCommitMessage -match "Tested against nanoframework/CoreLibrary#(\d+)"))
127+
if(($prCommitMessage -match "\[run mscorlib tests\]") -or ($prCommitMessage -match "\[tested against nanoframework/CoreLibrary#\d+\]"))
128128
{
129129
Write-Host "##[command] >> mscorlib tests are to be run"
130130
echo "##vso[task.setvariable variable=RUN_MSCORLIB_TESTS;isOutput=true]true"
@@ -190,14 +190,14 @@ jobs:
190190
Write-host "##[endgroup]"
191191
192192
# set default values
193-
echo "##vso[task.setvariable variable=BUILD_CHIBIOS;isOutput=true]false"
194-
echo "##vso[task.setvariable variable=BUILD_FREERTOS;isOutput=true]false"
195-
echo "##vso[task.setvariable variable=BUILD_ESP32;isOutput=true]false"
193+
echo "##vso[task.setvariable variable=BUILD_CHIBIOS;isOutput=true]false"
194+
echo "##vso[task.setvariable variable=BUILD_FREERTOS;isOutput=true]false"
195+
echo "##vso[task.setvariable variable=BUILD_ESP32;isOutput=true]false"
196196
echo "##vso[task.setvariable variable=BUILD_TI;isOutput=true]false"
197197
echo "##vso[task.setvariable variable=BUILD_AZURERTOS;isOutput=true]false"
198-
echo "##vso[task.setvariable variable=BUILD_WIN32;isOutput=true]false"
199-
echo "##vso[task.setvariable variable=BUILD_NANOCLR_CLI;isOutput=true]false"
200-
echo "##vso[task.setvariable variable=BUILD_ALL;isOutput=true]false"
198+
echo "##vso[task.setvariable variable=BUILD_WIN32;isOutput=true]false"
199+
echo "##vso[task.setvariable variable=BUILD_NANOCLR_CLI;isOutput=true]false"
200+
echo "##vso[task.setvariable variable=BUILD_CORE;isOutput=true]false"
201201
202202
if(
203203
(($files.where{$_.Contains('/')}).Count -eq 0) -Or
@@ -212,9 +212,9 @@ jobs:
212212
# - CMake
213213
# - src
214214
215-
echo "##vso[task.setvariable variable=BUILD_ALL;isOutput=true]true"
215+
echo "##vso[task.setvariable variable=BUILD_CORE;isOutput=true]true"
216216
217-
Write-host "##[command] Building ALL targets"
217+
Write-host "##[command] Minimal build required, changes at core folders"
218218
}
219219
220220
if( ($files.where{$_.Contains('targets/ChibiOS')}).Count -gt 0)
@@ -358,7 +358,7 @@ jobs:
358358
and(
359359
ne(dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true),
360360
or(
361-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
361+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
362362
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CHIBIOS'], true),
363363
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ESP32'], true),
364364
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_FREERTOS'], true),
@@ -391,7 +391,7 @@ jobs:
391391
succeeded('Check_Code_Style'),
392392
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
393393
or(
394-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
394+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
395395
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CHIBIOS'], true)
396396
)
397397
),
@@ -413,13 +413,14 @@ jobs:
413413

414414
strategy:
415415
matrix:
416-
ST_STM32F429I_DISCOVERY:
417-
TargetBoard: ST_STM32F429I_DISCOVERY
418-
TargetSeries: "stm32f4xx"
419-
BuildOptions:
420-
NeedsDFU: false
421-
NeedsSRECORD: false
422-
CMakePreset: ST_STM32F429I_DISCOVERY
416+
${{ if eq(variables['TargetsToBuild.BUILD_CHIBIOS'], true) }}:
417+
ST_STM32F429I_DISCOVERY:
418+
TargetBoard: ST_STM32F429I_DISCOVERY
419+
TargetSeries: "stm32f4xx"
420+
BuildOptions:
421+
NeedsDFU: false
422+
NeedsSRECORD: false
423+
CMakePreset: ST_STM32F429I_DISCOVERY
423424

424425
ST_STM32F769I_DISCOVERY:
425426
TargetBoard: ST_STM32F769I_DISCOVERY
@@ -456,7 +457,7 @@ jobs:
456457
succeeded('Check_Code_Style'),
457458
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
458459
or(
459-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
460+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
460461
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ESP32'], true)
461462
)
462463
),
@@ -488,68 +489,75 @@ jobs:
488489
PackageName: ESP32_PSRAM_REV0
489490
CMakePreset: ESP32_PSRAM_REV0
490491

491-
ESP32_BLE_REV0:
492-
TargetBoard: ESP32
493-
TargetSeries: "esp32"
494-
BuildOptions:
495-
IDF_Target: esp32
496-
TargetName: ESP32
497-
PackageName: ESP32_BLE_REV0
498-
CMakePreset: ESP32_BLE_REV0
499-
500-
ESP32_C3:
501-
TargetBoard: ESP32_C3
502-
TargetSeries: "esp32c3"
503-
BuildOptions:
504-
IDF_Target: esp32c3
505-
TargetName: ESP32_C3
506-
PackageName: ESP32_C3
507-
CMakePreset: ESP32_C3
508-
509-
ESP32_C6_THREAD:
510-
TargetBoard: ESP32_C6
511-
TargetSeries: "esp32c6"
512-
BuildOptions:
513-
IDF_Target: esp32c6
514-
TargetName: ESP32_C6_THREAD
515-
PackageName: ESP32_C6_THREAD
516-
CMakePreset: ESP32_C6_THREAD
517-
518-
ESP32_H2_THREAD:
519-
TargetBoard: ESP32_H2
520-
TargetSeries: "esp32h2"
521-
BuildOptions:
522-
IDF_Target: esp32h2
523-
TargetName: ESP32_H2_THREAD
524-
PackageName: ESP32_H2_THREAD
525-
CMakePreset: ESP32_H2_THREAD
526-
527-
ESP32_S3_ALL:
528-
TargetBoard: ESP32_S3
529-
TargetSeries: "esp32s3"
530-
BuildOptions:
531-
IDF_Target: esp32s3
532-
TargetName: ESP32_S3_ALL
533-
PackageName: ESP32_S3_ALL
534-
CMakePreset: ESP32_S3_ALL
535-
536-
ESP32_ETHERNET_KIT_1.2:
537-
TargetBoard: ESP32
538-
TargetSeries: "esp32"
539-
BuildOptions:
540-
IDF_Target: esp32
541-
TargetName: ESP32_ETHERNET_KIT_1.2
542-
PackageName: ESP32_ETHERNET_KIT_1.2
543-
CMakePreset: ESP32_ETHERNET_KIT_1.2
544-
545-
ESP32_P4_UART:
546-
TargetBoard: ESP32_P4
547-
TargetSeries: "esp32p4"
548-
BuildOptions:
549-
IDF_Target: esp32p4
550-
TargetName: ESP32_P4_UART
551-
PackageName: ESP32_P4_UART
552-
CMakePreset: ESP32_P4_UART
492+
${{ if eq(variables['TargetsToBuild.BUILD_ESP32'], true) }}:
493+
ESP32_BLE_REV0:
494+
TargetBoard: ESP32
495+
TargetSeries: "esp32"
496+
BuildOptions:
497+
IDF_Target: esp32
498+
TargetName: ESP32
499+
PackageName: ESP32_BLE_REV0
500+
CMakePreset: ESP32_BLE_REV0
501+
502+
${{ if eq(variables['TargetsToBuild.BUILD_ESP32'], true) }}:
503+
ESP32_C3:
504+
TargetBoard: ESP32_C3
505+
TargetSeries: "esp32c3"
506+
BuildOptions:
507+
IDF_Target: esp32c3
508+
TargetName: ESP32_C3
509+
PackageName: ESP32_C3
510+
CMakePreset: ESP32_C3
511+
512+
${{ if eq(variables['TargetsToBuild.BUILD_ESP32'], true) }}:
513+
ESP32_C6_THREAD:
514+
TargetBoard: ESP32_C6
515+
TargetSeries: "esp32c6"
516+
BuildOptions:
517+
IDF_Target: esp32c6
518+
TargetName: ESP32_C6_THREAD
519+
PackageName: ESP32_C6_THREAD
520+
CMakePreset: ESP32_C6_THREAD
521+
522+
${{ if eq(variables['TargetsToBuild.BUILD_ESP32'], true) }}:
523+
ESP32_H2_THREAD:
524+
TargetBoard: ESP32_H2
525+
TargetSeries: "esp32h2"
526+
BuildOptions:
527+
IDF_Target: esp32h2
528+
TargetName: ESP32_H2_THREAD
529+
PackageName: ESP32_H2_THREAD
530+
CMakePreset: ESP32_H2_THREAD
531+
532+
${{ if eq(variables['TargetsToBuild.BUILD_ESP32'], true) }}:
533+
ESP32_S3_ALL:
534+
TargetBoard: ESP32_S3
535+
TargetSeries: "esp32s3"
536+
BuildOptions:
537+
IDF_Target: esp32s3
538+
TargetName: ESP32_S3_ALL
539+
PackageName: ESP32_S3_ALL
540+
CMakePreset: ESP32_S3_ALL
541+
542+
${{ if eq(variables['TargetsToBuild.BUILD_ESP32'], true) }}:
543+
ESP32_ETHERNET_KIT_1.2:
544+
TargetBoard: ESP32
545+
TargetSeries: "esp32"
546+
BuildOptions:
547+
IDF_Target: esp32
548+
TargetName: ESP32_ETHERNET_KIT_1.2
549+
PackageName: ESP32_ETHERNET_KIT_1.2
550+
CMakePreset: ESP32_ETHERNET_KIT_1.2
551+
552+
${{ if eq(variables['TargetsToBuild.BUILD_ESP32'], true) }}:
553+
ESP32_P4_UART:
554+
TargetBoard: ESP32_P4
555+
TargetSeries: "esp32p4"
556+
BuildOptions:
557+
IDF_Target: esp32p4
558+
TargetName: ESP32_P4_UART
559+
PackageName: ESP32_P4_UART
560+
CMakePreset: ESP32_P4_UART
553561

554562
variables:
555563
DOTNET_NOLOGO: true
@@ -610,7 +618,7 @@ jobs:
610618
succeeded('Check_Code_Style'),
611619
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
612620
or(
613-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
621+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
614622
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_FREERTOS'], true)
615623
)
616624
),
@@ -665,7 +673,7 @@ jobs:
665673
succeeded('Check_Code_Style'),
666674
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
667675
or(
668-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
676+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
669677
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_TI'], true)
670678
)
671679
),
@@ -743,7 +751,7 @@ jobs:
743751
succeeded('Check_Code_Style'),
744752
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
745753
or(
746-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
754+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
747755
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_AZURERTOS'], true)
748756
)
749757
),
@@ -815,7 +823,7 @@ jobs:
815823
succeeded('Check_Code_Style'),
816824
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
817825
or(
818-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
826+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
819827
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_WIN32'], true)
820828
)
821829
),
@@ -1040,11 +1048,18 @@ jobs:
10401048
and(
10411049
succeeded('Check_Code_Style'),
10421050
ne(dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true),
1051+
ne(variables['System.PullRequest.PullRequestId'], ''),
10431052
or(
1044-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
1053+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.RUN_MSCORLIB_TESTS'], true),
10451054
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_NANOCLR_CLI'], true)
10461055
)
10471056
),
1057+
and(
1058+
succeeded('Check_Code_Style'),
1059+
ne(dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true),
1060+
eq(variables['System.PullRequest.PullRequestId'], ''),
1061+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_NANOCLR_CLI'], true)
1062+
),
10481063
and(
10491064
eq(variables['Build.Reason'], 'Manual'),
10501065
or(
@@ -1219,11 +1234,7 @@ jobs:
12191234
succeeded('Build_nanoCLR_CLI'),
12201235
ne(dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true),
12211236
ne(variables['System.PullRequest.PullRequestId'], ''),
1222-
or(
1223-
eq(dependencies.Check_Build_Options.outputs['BuildOptions.RUN_MSCORLIB_TESTS'], true),
1224-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
1225-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_NANOCLR_CLI'], true)
1226-
)
1237+
eq(dependencies.Check_Build_Options.outputs['BuildOptions.RUN_MSCORLIB_TESTS'], true)
12271238
),
12281239
and(
12291240
eq(variables['Build.Reason'], 'Manual'),

0 commit comments

Comments
 (0)