diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e8d813de3..345f557897 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -844,7 +844,7 @@ elseif(RTOS_ESP32_CHECK) else() # board NOT found in targets folder - 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") + 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") endif() endif() diff --git a/azure-pipelines-nightly.yml b/azure-pipelines-nightly.yml index 626c12631a..a6a3714a3c 100644 --- a/azure-pipelines-nightly.yml +++ b/azure-pipelines-nightly.yml @@ -430,7 +430,7 @@ jobs: repoDirectory: '$(Build.SourcesDirectory)\nf-interpreter' - template: azure-pipelines-templates/build-espressif-esp32-targets.yml - - task: CopyFiles@1 + - task: CopyFiles@2 condition: succeeded() displayName: Copying bootloader inputs: @@ -439,6 +439,7 @@ jobs: bootloader.bin TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)' flattenFolders: true + ignoreMakeDirErrors: true - template: azure-pipelines-templates/copy-sdkconfig.yml - template: azure-pipelines-templates/pack-publish-artifacts.yml diff --git a/azure-pipelines-templates/copy-sdkconfig.yml b/azure-pipelines-templates/copy-sdkconfig.yml index ba89d7aa6d..ef914eab81 100644 --- a/azure-pipelines-templates/copy-sdkconfig.yml +++ b/azure-pipelines-templates/copy-sdkconfig.yml @@ -2,7 +2,7 @@ # See LICENSE file in the project root for full license information. steps: - - task: CopyFiles@1 + - task: CopyFiles@2 condition: succeeded() displayName: Copying SDKCONFIG inputs: @@ -10,3 +10,4 @@ steps: Contents: | sdkconfig TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)_sdkconfig' + ignoreMakeDirErrors: true diff --git a/azure-pipelines-templates/pack-publish-artifacts.yml b/azure-pipelines-templates/pack-publish-artifacts.yml index 2f594f5d5f..6597d75114 100644 --- a/azure-pipelines-templates/pack-publish-artifacts.yml +++ b/azure-pipelines-templates/pack-publish-artifacts.yml @@ -5,7 +5,9 @@ parameters: buildDirectory: '$(Build.SourcesDirectory)\build' steps: - - task: CopyFiles@1 + - task: CopyFiles@2 + condition: succeeded() + displayName: Collecting deployable artifacts inputs: sourceFolder: ${{ parameters.buildDirectory }} Contents: | @@ -15,5 +17,4 @@ steps: *.dfu TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)' flattenFolders: true - condition: succeeded() - displayName: Collecting deployable artifacts + ignoreMakeDirErrors: true diff --git a/azure-pipelines-templates/pack-publish-managed-helpers.yml b/azure-pipelines-templates/pack-publish-managed-helpers.yml index 7cab4b31f2..2cbe1bb158 100644 --- a/azure-pipelines-templates/pack-publish-managed-helpers.yml +++ b/azure-pipelines-templates/pack-publish-managed-helpers.yml @@ -41,15 +41,16 @@ steps: condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) ) displayName: Pack managed helpers NuGet - - task: CopyFiles@1 + - task: CopyFiles@2 + condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) ) + displayName: Collecting managed helpers deployable artifacts inputs: sourceFolder: $(Build.SourcesDirectory) Contents: | **\nanoFramework.Targets*.nupkg TargetFolder: '$(Build.ArtifactStagingDirectory)' flattenFolders: true - condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) ) - displayName: Collecting managed helpers deployable artifacts + ignoreMakeDirErrors: true # push NuGet packages to NuGet (happens except on PR builds) - task: NuGetCommand@2 diff --git a/azure-pipelines-templates/pack-publish-ti-sl-managed-helpers.yml b/azure-pipelines-templates/pack-publish-ti-sl-managed-helpers.yml index a7a73bb689..6152f628b7 100644 --- a/azure-pipelines-templates/pack-publish-ti-sl-managed-helpers.yml +++ b/azure-pipelines-templates/pack-publish-ti-sl-managed-helpers.yml @@ -41,15 +41,16 @@ steps: condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) ) displayName: Pack managed helpers NuGet - - task: CopyFiles@1 + - task: CopyFiles@2 + condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) ) + displayName: Collecting managed helpers deployable artifacts inputs: sourceFolder: $(Build.SourcesDirectory) Contents: | **\nanoFramework.Targets*.nupkg TargetFolder: '$(Build.ArtifactStagingDirectory)' flattenFolders: true - condition: and( succeeded(), eq(variables['BUILD_NUGET_PACKAGE'], true) ) - displayName: Collecting managed helpers deployable artifacts + ignoreMakeDirErrors: true # push NuGet packages to NuGet (happens except on PR builds) - task: NuGetCommand@2 diff --git a/azure-pipelines-templates/publish-cloudsmith.yml b/azure-pipelines-templates/publish-cloudsmith.yml index da169adf6c..73ab465cd5 100644 --- a/azure-pipelines-templates/publish-cloudsmith.yml +++ b/azure-pipelines-templates/publish-cloudsmith.yml @@ -25,7 +25,7 @@ steps: archiveFile: '$(Agent.TempDirectory)\$(TargetPublishName)-$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER).zip' replaceExistingArchive: true - - task: CopyFiles@1 + - task: CopyFiles@2 condition: >- and( succeeded(), @@ -43,6 +43,7 @@ steps: $(TargetPublishName)-$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER).zip TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)' flattenFolders: true + ignoreMakeDirErrors: true - task: ArchiveFiles@2 condition: >- @@ -62,7 +63,7 @@ steps: archiveFile: '$(Agent.TempDirectory)\$(TargetPublishName)-$(NBGV_SimpleVersion)-preview.$(TARGET_BUILD_COUNTER).zip' replaceExistingArchive: true - - task: CopyFiles@1 + - task: CopyFiles@2 condition: >- and( succeeded(), @@ -79,6 +80,7 @@ steps: $(TargetPublishName)-$(NBGV_SimpleVersion)-preview.$(TARGET_BUILD_COUNTER).zip TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)' flattenFolders: true + ignoreMakeDirErrors: true - task: PublishBuildArtifacts@1 condition: succeeded() diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ba3b429918..b38d17a363 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -443,7 +443,7 @@ jobs: repoDirectory: '$(Build.SourcesDirectory)\nf-interpreter' - template: azure-pipelines-templates/build-espressif-esp32-targets.yml - - task: CopyFiles@1 + - task: CopyFiles@2 condition: succeeded() displayName: Copying bootloader inputs: @@ -452,6 +452,8 @@ jobs: bootloader.bin TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)' flattenFolders: true + ignoreMakeDirErrors: true + - template: azure-pipelines-templates/copy-sdkconfig.yml - template: azure-pipelines-templates/pack-publish-artifacts.yml parameters: @@ -721,7 +723,7 @@ jobs: command: 'custom' arguments: 'pack targets\win32\nanoFramework.nanoCLR.Win32.nuspec -Version $(NBGV_NuGetPackageVersion)' - - task: CopyFiles@1 + - task: CopyFiles@2 condition: succeeded() displayName: Collecting managed helpers deployable artifacts inputs: @@ -730,8 +732,9 @@ jobs: **\nanoFramework.nanoCLR.Win32*.nupkg TargetFolder: '$(Build.ArtifactStagingDirectory)' flattenFolders: true - - - task: CopyFiles@1 + ignoreMakeDirErrors: true + + - task: CopyFiles@2 condition: succeeded() displayName: Collecting EXE to deployable artifacts inputs: @@ -740,6 +743,7 @@ jobs: **\nanoFramework.nanoCLR.exe TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)' flattenFolders: true + ignoreMakeDirErrors: true - pwsh: | .\SignClient "Sign" `