Skip to content

Commit b9cf8c5

Browse files
josesimoesjosesimoes
committed
Work CI-CD (#3253)
***NO_CI***
1 parent 2f9ddd4 commit b9cf8c5

File tree

3 files changed

+111
-97
lines changed

3 files changed

+111
-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: 107 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,18 @@ jobs:
121121
$prCommitMessage = $($pr.body)
122122
123123
# debug output
124-
# echo "=====`r`n$($prCommitMessage)`r`n====="
124+
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"
131131
}
132+
else
133+
{
134+
Write-Host "##[command] >> mscorlib unit tests will NOT be run"
135+
}
132136
}
133137
else
134138
{
@@ -190,14 +194,14 @@ jobs:
190194
Write-host "##[endgroup]"
191195
192196
# 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"
197+
echo "##vso[task.setvariable variable=BUILD_CHIBIOS;isOutput=true]false"
198+
echo "##vso[task.setvariable variable=BUILD_FREERTOS;isOutput=true]false"
199+
echo "##vso[task.setvariable variable=BUILD_ESP32;isOutput=true]false"
196200
echo "##vso[task.setvariable variable=BUILD_TI;isOutput=true]false"
197201
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"
202+
echo "##vso[task.setvariable variable=BUILD_WIN32;isOutput=true]false"
203+
echo "##vso[task.setvariable variable=BUILD_NANOCLR_CLI;isOutput=true]false"
204+
echo "##vso[task.setvariable variable=BUILD_CORE;isOutput=true]false"
201205
202206
if(
203207
(($files.where{$_.Contains('/')}).Count -eq 0) -Or
@@ -212,9 +216,9 @@ jobs:
212216
# - CMake
213217
# - src
214218
215-
echo "##vso[task.setvariable variable=BUILD_ALL;isOutput=true]true"
219+
echo "##vso[task.setvariable variable=BUILD_CORE;isOutput=true]true"
216220
217-
Write-host "##[command] Building ALL targets"
221+
Write-host "##[command] Minimal build required, changes at core folders"
218222
}
219223
220224
if( ($files.where{$_.Contains('targets/ChibiOS')}).Count -gt 0)
@@ -358,7 +362,7 @@ jobs:
358362
and(
359363
ne(dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true),
360364
or(
361-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
365+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
362366
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CHIBIOS'], true),
363367
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ESP32'], true),
364368
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_FREERTOS'], true),
@@ -391,7 +395,7 @@ jobs:
391395
succeeded('Check_Code_Style'),
392396
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
393397
or(
394-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
398+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
395399
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CHIBIOS'], true)
396400
)
397401
),
@@ -413,13 +417,14 @@ jobs:
413417

414418
strategy:
415419
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
420+
${{ if eq(variables['TargetsToBuild.BUILD_CHIBIOS'], true) }}:
421+
ST_STM32F429I_DISCOVERY:
422+
TargetBoard: ST_STM32F429I_DISCOVERY
423+
TargetSeries: "stm32f4xx"
424+
BuildOptions:
425+
NeedsDFU: false
426+
NeedsSRECORD: false
427+
CMakePreset: ST_STM32F429I_DISCOVERY
423428

424429
ST_STM32F769I_DISCOVERY:
425430
TargetBoard: ST_STM32F769I_DISCOVERY
@@ -456,7 +461,7 @@ jobs:
456461
succeeded('Check_Code_Style'),
457462
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
458463
or(
459-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
464+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
460465
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ESP32'], true)
461466
)
462467
),
@@ -488,68 +493,75 @@ jobs:
488493
PackageName: ESP32_PSRAM_REV0
489494
CMakePreset: ESP32_PSRAM_REV0
490495

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

554566
variables:
555567
DOTNET_NOLOGO: true
@@ -610,7 +622,7 @@ jobs:
610622
succeeded('Check_Code_Style'),
611623
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
612624
or(
613-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
625+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
614626
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_FREERTOS'], true)
615627
)
616628
),
@@ -665,7 +677,7 @@ jobs:
665677
succeeded('Check_Code_Style'),
666678
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
667679
or(
668-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
680+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
669681
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_TI'], true)
670682
)
671683
),
@@ -743,7 +755,7 @@ jobs:
743755
succeeded('Check_Code_Style'),
744756
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
745757
or(
746-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
758+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
747759
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_AZURERTOS'], true)
748760
)
749761
),
@@ -815,7 +827,7 @@ jobs:
815827
succeeded('Check_Code_Style'),
816828
ne( dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true ),
817829
or(
818-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
830+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_CORE'], true),
819831
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_WIN32'], true)
820832
)
821833
),
@@ -1040,11 +1052,18 @@ jobs:
10401052
and(
10411053
succeeded('Check_Code_Style'),
10421054
ne(dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true),
1055+
ne(variables['System.PullRequest.PullRequestId'], ''),
10431056
or(
1044-
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_ALL'], true),
1057+
eq(dependencies.Check_Build_Options.outputs['BuildOptions.RUN_MSCORLIB_TESTS'], true),
10451058
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_NANOCLR_CLI'], true)
10461059
)
10471060
),
1061+
and(
1062+
succeeded('Check_Code_Style'),
1063+
ne(dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true),
1064+
eq(variables['System.PullRequest.PullRequestId'], ''),
1065+
eq(dependencies.Check_Build_Options.outputs['TargetsToBuild.BUILD_NANOCLR_CLI'], true)
1066+
),
10481067
and(
10491068
eq(variables['Build.Reason'], 'Manual'),
10501069
or(
@@ -1219,11 +1238,7 @@ jobs:
12191238
succeeded('Build_nanoCLR_CLI'),
12201239
ne(dependencies.Check_Build_Options.outputs['BuildOptions.SKIP_BUILD'], true),
12211240
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-
)
1241+
eq(dependencies.Check_Build_Options.outputs['BuildOptions.RUN_MSCORLIB_TESTS'], true)
12271242
),
12281243
and(
12291244
eq(variables['Build.Reason'], 'Manual'),

0 commit comments

Comments
 (0)