Skip to content

Commit 59c0cdb

Browse files
committed
Work CI-CD
- Add tags to cloudsmith packages. - Addresses concern in nanoframework/nanoFirmwareFlasher#96. - Allows better filtering and querying.
1 parent 56ee65a commit 59c0cdb

File tree

3 files changed

+29
-1
lines changed

3 files changed

+29
-1
lines changed

azure-pipelines-nightly.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ jobs:
181181
matrix:
182182
NETDUINO3_WIFI:
183183
TargetBoard: NETDUINO3_WIFI
184+
TargetSeries: 'stm32f4xx'
184185
BuildOptions: >-
185186
-DTARGET_SERIES=STM32F4xx
186187
-DRTOS=ChibiOS
@@ -207,6 +208,7 @@ jobs:
207208
NeedsSRECORD: false
208209
ORGPAL_PALTHREE:
209210
TargetBoard: ORGPAL_PALTHREE
211+
TargetSeries: 'stm32f7xx'
210212
BuildOptions: >-
211213
-DTARGET_SERIES=STM32F7xx
212214
-DRTOS=ChibiOS
@@ -239,6 +241,7 @@ jobs:
239241
NeedsSRECORD: false
240242
ST_NUCLEO64_F091RC:
241243
TargetBoard: ST_NUCLEO64_F091RC
244+
TargetSeries: 'stm32f0xx'
242245
BuildOptions: >-
243246
-DTARGET_SERIES=STM32F0xx
244247
-DRTOS=ChibiOS
@@ -265,6 +268,7 @@ jobs:
265268
REVISION: $[counter('STM32_versioncounter_1_7_1', 1000)]
266269
GNU_GCC_TOOLCHAIN_PATH: $(Agent.TempDirectory)\GNU_Tools_ARM_Embedded
267270
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
271+
TargetPlatform: 'stm32'
268272

269273
steps:
270274
- template: azure-pipelines-templates/build-preparations.yml
@@ -301,6 +305,7 @@ jobs:
301305
matrix:
302306
ESP32_REV0:
303307
TargetBoard: ESP32
308+
TargetSeries: 'esp32'
304309
BuildOptions: >-
305310
-DTARGET_SERIES=ESP32
306311
-DRTOS=ESP32
@@ -335,6 +340,7 @@ jobs:
335340
PackageName: ESP32_REV0
336341
ESP32_PSRAM_REV3:
337342
TargetBoard: ESP32
343+
TargetSeries: 'esp32'
338344
BuildOptions: >-
339345
-DTARGET_SERIES=ESP32
340346
-DRTOS=ESP32
@@ -369,6 +375,7 @@ jobs:
369375
PackageName: ESP32_PSRAM_REV3
370376
ESP32_PSRAM_XTAL26_REV0:
371377
TargetBoard: ESP32
378+
TargetSeries: 'esp32'
372379
BuildOptions: >-
373380
-DTARGET_SERIES=ESP32
374381
-DRTOS=ESP32
@@ -404,6 +411,7 @@ jobs:
404411
PackageName: ESP32_PSRAM_XTAL26_REV0
405412
ESP32_REV3:
406413
TargetBoard: ESP32
414+
TargetSeries: 'esp32'
407415
BuildOptions: >-
408416
-DTARGET_SERIES=ESP32
409417
-DRTOS=ESP32
@@ -438,6 +446,7 @@ jobs:
438446
PackageName: ESP32_REV3
439447
ESP32_PICO:
440448
TargetBoard: ESP32
449+
TargetSeries: 'esp32'
441450
BuildOptions: >-
442451
-DTARGET_SERIES=ESP32
443452
-DRTOS=ESP32
@@ -470,6 +479,7 @@ jobs:
470479
PackageName: ESP32_PICO
471480
KALUGA_1:
472481
TargetBoard: ESP32_S2
482+
TargetSeries: 'esp32_s2'
473483
BuildOptions: >-
474484
-DTARGET_SERIES=ESP32_S2
475485
-DRTOS=ESP32
@@ -511,6 +521,7 @@ jobs:
511521
REVISION: $[counter('ESP32_versioncounter_1_7_1', 1000)]
512522
IDF_PATH: 'D:/a/1/s/esp-idf'
513523
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
524+
TargetPlatform: 'esp32'
514525

515526
steps:
516527
- checkout: self
@@ -563,6 +574,7 @@ jobs:
563574
TI_CC1352R1_LAUNCHXL_868:
564575
TargetBoard: TI_CC1352R1_LAUNCHXL
565576
PackageName: TI_CC1352R1_LAUNCHXL_868
577+
TargetSeries: 'cc13x2_26x2'
566578
BuildOptions: >-
567579
-DTARGET_SERIES=CC13x2_26x2
568580
-DRTOS=TI_SimpleLink
@@ -588,6 +600,7 @@ jobs:
588600
REVISION: $[counter('TI_versioncounter_1_7_1', 1000)]
589601
GNU_GCC_TOOLCHAIN_PATH: $(Agent.TempDirectory)\GNU_Tools_ARM_Embedded
590602
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
603+
TargetPlatform: 'ti_simplelink'
591604

592605
steps:
593606
- template: azure-pipelines-templates/build-preparations.yml

azure-pipelines-templates/publish-cloudsmith.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ steps:
117117
118118
Write-Host "Uploading $(PUBLISHING_PACKAGE_NAME) v$(PACKAGE_VERSION)"
119119
120-
cloudsmith push raw net-nanoframework/$(CLOUDSMITH_REPO) $(Agent.TempDirectory)\$(PUBLISHING_PACKAGE_NAME).zip --name $(TargetPublishName) --version $(PACKAGE_VERSION) -k $(CLOUDSMITH_KEY)
120+
cloudsmith push raw net-nanoframework/$(CLOUDSMITH_REPO) $(Agent.TempDirectory)\$(PUBLISHING_PACKAGE_NAME).zip --name $(TargetPublishName) --version $(PACKAGE_VERSION) --tags $(TargetPlatform),$(TargetSeries) -k $(CLOUDSMITH_KEY)
121121
122122
errorActionPreference: 'stop'
123123
failOnStderr: 'false'

azure-pipelines.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ jobs:
282282
matrix:
283283
ST_STM32F429I_DISCOVERY:
284284
TargetBoard: ST_STM32F429I_DISCOVERY
285+
TargetSeries: 'stm32f4xx'
285286
BuildOptions: >-
286287
-DTARGET_SERIES=STM32F4xx
287288
-DRTOS=ChibiOS
@@ -307,6 +308,7 @@ jobs:
307308
NeedsSRECORD: false
308309
ST_STM32F769I_DISCOVERY:
309310
TargetBoard: ST_STM32F769I_DISCOVERY
311+
TargetSeries: 'stm32f7xx'
310312
BuildOptions: >-
311313
-DTARGET_SERIES=STM32F7xx
312314
-DRTOS=ChibiOS
@@ -349,6 +351,7 @@ jobs:
349351
REVISION: $[counter('STM32_versioncounter', 0)]
350352
GNU_GCC_TOOLCHAIN_PATH: $(Agent.TempDirectory)\GNU_Tools_ARM_Embedded
351353
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
354+
TargetPlatform: 'stm32'
352355

353356
steps:
354357
- template: azure-pipelines-templates/build-preparations.yml
@@ -387,6 +390,7 @@ jobs:
387390
matrix:
388391
ESP32_PSRAM_REV0:
389392
TargetBoard: ESP32
393+
TargetSeries: 'esp32'
390394
BuildOptions: >-
391395
-DTARGET_SERIES=ESP32
392396
-DRTOS=ESP32
@@ -422,6 +426,7 @@ jobs:
422426
# BUILD FAILING ON IRAM0 overflow
423427
# ESP32_BLE_REV0:
424428
# TargetBoard: ESP32
429+
# TargetSeries: 'esp32'
425430
# BuildOptions: >-
426431
# -DTARGET_SERIES=ESP32
427432
# -DRTOS=ESP32
@@ -463,6 +468,7 @@ jobs:
463468
# BUILD FAILING ON IRAM0 overflow
464469
# ESP32_BLE_REV3:
465470
# TargetBoard: ESP32
471+
# TargetSeries: 'esp32'
466472
# BuildOptions: >-
467473
# -DTARGET_SERIES=ESP32
468474
# -DRTOS=ESP32
@@ -502,6 +508,7 @@ jobs:
502508
# PackageName: ESP32_BLE_REV3
503509
ESP_WROVER_KIT:
504510
TargetBoard: ESP32
511+
TargetSeries: 'esp32'
505512
BuildOptions: >-
506513
-DTARGET_SERIES=ESP32
507514
-DRTOS=ESP32
@@ -541,6 +548,7 @@ jobs:
541548
PackageName: ESP_WROVER_KIT
542549
ESP32_LILYGO:
543550
TargetBoard: ESP32
551+
TargetSeries: 'esp32'
544552
BuildOptions: >-
545553
-DTARGET_SERIES=ESP32
546554
-DRTOS=ESP32
@@ -576,6 +584,7 @@ jobs:
576584
PackageName: ESP32_LILYGO
577585
FEATHER_S2:
578586
TargetBoard: ESP32_S2
587+
TargetSeries: 'esp32_s2'
579588
BuildOptions: >-
580589
-DTARGET_SERIES=ESP32_S2
581590
-DRTOS=ESP32
@@ -613,6 +622,7 @@ jobs:
613622
REVISION: $[counter('ESP32_versioncounter', 0)]
614623
IDF_PATH: 'D:/a/1/s/esp-idf'
615624
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
625+
TargetPlatform: 'esp32'
616626

617627
steps:
618628
- checkout: self
@@ -666,6 +676,7 @@ jobs:
666676
matrix:
667677
NXP_MIMXRT1060_EVK:
668678
TargetBoard: NXP_MIMXRT1060_EVK
679+
TargetSeries: 'imxrt10xx'
669680
BuildOptions: >-
670681
-DTARGET_SERIES=IMXRT10xx
671682
-DRTOS=FreeRTOS
@@ -692,6 +703,7 @@ jobs:
692703
REVISION: $[counter('NXP_versioncounter', 0)]
693704
GNU_GCC_TOOLCHAIN_PATH: $(Agent.TempDirectory)\GNU_Tools_ARM_Embedded
694705
GIT_LFS_SKIP_SMUDGE: 1
706+
TargetPlatform: 'freertos'
695707

696708
steps:
697709
- template: azure-pipelines-templates/build-preparations.yml
@@ -729,6 +741,7 @@ jobs:
729741
# disabled: waiting to update SDK to latest version with Sys Config
730742
# TI_CC3220SF_LAUNCHXL:
731743
# TargetBoard: TI_CC3220SF_LAUNCHXL
744+
# TargetSeries: 'cc32xx'
732745
# BuildOptions: >-
733746
# -DTARGET_SERIES=CC32xx
734747
# -DRTOS=TI_SimpleLink
@@ -755,6 +768,7 @@ jobs:
755768
TI_CC1352R1_LAUNCHXL_915:
756769
TargetBoard: TI_CC1352R1_LAUNCHXL
757770
PackageName: TI_CC1352R1_LAUNCHXL_915
771+
TargetSeries: 'cc13x2_26x2'
758772
BuildOptions: >-
759773
-DTARGET_SERIES=CC13x2_26x2
760774
-DRTOS=TI_SimpleLink
@@ -780,6 +794,7 @@ jobs:
780794
REVISION: $[counter('TI_versioncounter', 0)]
781795
GNU_GCC_TOOLCHAIN_PATH: $(Agent.TempDirectory)\GNU_Tools_ARM_Embedded
782796
HelperPackageVersion: $[counter('HelperPackageVersioncounter', 0)]
797+
TargetPlatform: 'ti_simplelink'
783798

784799
steps:
785800
- template: azure-pipelines-templates/build-preparations.yml

0 commit comments

Comments
 (0)