Skip to content

Commit b35dd8d

Browse files
committed
Work CI-CD
- Migrate AZDO copy files task to v2. - Fix typo in CMake output message. ***NO_CI***
1 parent 136c8b0 commit b35dd8d

8 files changed

+29
-18
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ elseif(RTOS_ESP32_CHECK)
844844

845845
else()
846846
# board NOT found in targets folder
847-
message(FATAL_ERROR "\n\nSorry but support for ${TARGET_BOARD} target is not available...\n\You can wait for that to be added or you might want to contribute and start working on a PR for that.\n\n")
847+
message(FATAL_ERROR "\n\nSorry but support for ${TARGET_BOARD} target is not available...\n\nYou can wait for that to be added or you might want to contribute and start working on a PR for that.\n\n")
848848
endif()
849849
endif()
850850

azure-pipelines-nightly.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ jobs:
430430
repoDirectory: '$(Build.SourcesDirectory)\nf-interpreter'
431431
- template: azure-pipelines-templates/build-espressif-esp32-targets.yml
432432

433-
- task: CopyFiles@1
433+
- task: CopyFiles@2
434434
condition: succeeded()
435435
displayName: Copying bootloader
436436
inputs:
@@ -439,6 +439,7 @@ jobs:
439439
bootloader.bin
440440
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)'
441441
flattenFolders: true
442+
ignoreMakeDirErrors: true
442443

443444
- template: azure-pipelines-templates/copy-sdkconfig.yml
444445
- template: azure-pipelines-templates/pack-publish-artifacts.yml

azure-pipelines-templates/copy-sdkconfig.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
# See LICENSE file in the project root for full license information.
33

44
steps:
5-
- task: CopyFiles@1
5+
- task: CopyFiles@2
66
condition: succeeded()
77
displayName: Copying SDKCONFIG
88
inputs:
99
sourceFolder: '$(Build.SourcesDirectory)\nf-interpreter'
1010
Contents: |
1111
sdkconfig
1212
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)_sdkconfig'
13+
ignoreMakeDirErrors: true

azure-pipelines-templates/pack-publish-artifacts.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ parameters:
55
buildDirectory: '$(Build.SourcesDirectory)\build'
66

77
steps:
8-
- task: CopyFiles@1
8+
- task: CopyFiles@2
9+
condition: succeeded()
10+
displayName: Collecting deployable artifacts
911
inputs:
1012
sourceFolder: ${{ parameters.buildDirectory }}
1113
Contents: |
@@ -15,5 +17,4 @@ steps:
1517
*.dfu
1618
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)'
1719
flattenFolders: true
18-
condition: succeeded()
19-
displayName: Collecting deployable artifacts
20+
ignoreMakeDirErrors: true

azure-pipelines-templates/pack-publish-managed-helpers.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,16 @@ steps:
4141
condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) )
4242
displayName: Pack managed helpers NuGet
4343

44-
- task: CopyFiles@1
44+
- task: CopyFiles@2
45+
condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) )
46+
displayName: Collecting managed helpers deployable artifacts
4547
inputs:
4648
sourceFolder: $(Build.SourcesDirectory)
4749
Contents: |
4850
**\nanoFramework.Targets*.nupkg
4951
TargetFolder: '$(Build.ArtifactStagingDirectory)'
5052
flattenFolders: true
51-
condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) )
52-
displayName: Collecting managed helpers deployable artifacts
53+
ignoreMakeDirErrors: true
5354

5455
# push NuGet packages to NuGet (happens except on PR builds)
5556
- task: NuGetCommand@2

azure-pipelines-templates/pack-publish-ti-sl-managed-helpers.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,16 @@ steps:
4141
condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) )
4242
displayName: Pack managed helpers NuGet
4343

44-
- task: CopyFiles@1
44+
- task: CopyFiles@2
45+
condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) )
46+
displayName: Collecting managed helpers deployable artifacts
4547
inputs:
4648
sourceFolder: $(Build.SourcesDirectory)
4749
Contents: |
4850
**\nanoFramework.Targets*.nupkg
4951
TargetFolder: '$(Build.ArtifactStagingDirectory)'
5052
flattenFolders: true
51-
condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) )
52-
displayName: Collecting managed helpers deployable artifacts
53+
ignoreMakeDirErrors: true
5354

5455
# push NuGet packages to NuGet (happens except on PR builds)
5556
- task: NuGetCommand@2

azure-pipelines-templates/publish-cloudsmith.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ steps:
2525
archiveFile: '$(Agent.TempDirectory)\$(TargetPublishName)-$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER).zip'
2626
replaceExistingArchive: true
2727

28-
- task: CopyFiles@1
28+
- task: CopyFiles@2
2929
condition: >-
3030
and(
3131
succeeded(),
@@ -43,6 +43,7 @@ steps:
4343
$(TargetPublishName)-$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER).zip
4444
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)'
4545
flattenFolders: true
46+
ignoreMakeDirErrors: true
4647

4748
- task: ArchiveFiles@2
4849
condition: >-
@@ -62,7 +63,7 @@ steps:
6263
archiveFile: '$(Agent.TempDirectory)\$(TargetPublishName)-$(NBGV_SimpleVersion)-preview.$(TARGET_BUILD_COUNTER).zip'
6364
replaceExistingArchive: true
6465

65-
- task: CopyFiles@1
66+
- task: CopyFiles@2
6667
condition: >-
6768
and(
6869
succeeded(),
@@ -79,6 +80,7 @@ steps:
7980
$(TargetPublishName)-$(NBGV_SimpleVersion)-preview.$(TARGET_BUILD_COUNTER).zip
8081
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)'
8182
flattenFolders: true
83+
ignoreMakeDirErrors: true
8284

8385
- task: PublishBuildArtifacts@1
8486
condition: succeeded()

azure-pipelines.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ jobs:
443443
repoDirectory: '$(Build.SourcesDirectory)\nf-interpreter'
444444
- template: azure-pipelines-templates/build-espressif-esp32-targets.yml
445445

446-
- task: CopyFiles@1
446+
- task: CopyFiles@2
447447
condition: succeeded()
448448
displayName: Copying bootloader
449449
inputs:
@@ -452,6 +452,8 @@ jobs:
452452
bootloader.bin
453453
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)'
454454
flattenFolders: true
455+
ignoreMakeDirErrors: true
456+
455457
- template: azure-pipelines-templates/copy-sdkconfig.yml
456458
- template: azure-pipelines-templates/pack-publish-artifacts.yml
457459
parameters:
@@ -721,7 +723,7 @@ jobs:
721723
command: 'custom'
722724
arguments: 'pack targets\win32\nanoFramework.nanoCLR.Win32.nuspec -Version $(NBGV_NuGetPackageVersion)'
723725

724-
- task: CopyFiles@1
726+
- task: CopyFiles@2
725727
condition: succeeded()
726728
displayName: Collecting managed helpers deployable artifacts
727729
inputs:
@@ -730,8 +732,9 @@ jobs:
730732
**\nanoFramework.nanoCLR.Win32*.nupkg
731733
TargetFolder: '$(Build.ArtifactStagingDirectory)'
732734
flattenFolders: true
733-
734-
- task: CopyFiles@1
735+
ignoreMakeDirErrors: true
736+
737+
- task: CopyFiles@2
735738
condition: succeeded()
736739
displayName: Collecting EXE to deployable artifacts
737740
inputs:
@@ -740,6 +743,7 @@ jobs:
740743
**\nanoFramework.nanoCLR.exe
741744
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)'
742745
flattenFolders: true
746+
ignoreMakeDirErrors: true
743747

744748
- pwsh: |
745749
.\SignClient "Sign" `

0 commit comments

Comments
 (0)