Skip to content

Commit

Permalink
Work CI-CD
Browse files Browse the repository at this point in the history
- Migrate AZDO copy files task to v2.
- Fix typo in CMake output message.

***NO_CI***
  • Loading branch information
josesimoes committed Oct 21, 2022
1 parent 136c8b0 commit c66fb61
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 18 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
3 changes: 2 additions & 1 deletion azure-pipelines-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion azure-pipelines-templates/copy-sdkconfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
# See LICENSE file in the project root for full license information.

steps:
- task: CopyFiles@1
- task: CopyFiles@2
condition: succeeded()
displayName: Copying SDKCONFIG
inputs:
sourceFolder: '$(Build.SourcesDirectory)\nf-interpreter'
Contents: |
sdkconfig
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)_sdkconfig'
ignoreMakeDirErrors: true
7 changes: 4 additions & 3 deletions azure-pipelines-templates/pack-publish-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -15,5 +17,4 @@ steps:
*.dfu
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)'
flattenFolders: true
condition: succeeded()
displayName: Collecting deployable artifacts
ignoreMakeDirErrors: true
7 changes: 4 additions & 3 deletions azure-pipelines-templates/pack-publish-managed-helpers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions azure-pipelines-templates/publish-cloudsmith.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -43,6 +43,7 @@ steps:
$(TargetPublishName)-$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER).zip
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)'
flattenFolders: true
ignoreMakeDirErrors: true

- task: ArchiveFiles@2
condition: >-
Expand All @@ -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(),
Expand All @@ -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()
Expand Down
12 changes: 8 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -740,6 +743,7 @@ jobs:
**\nanoFramework.nanoCLR.exe
TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)'
flattenFolders: true
ignoreMakeDirErrors: true

- pwsh: |
.\SignClient "Sign" `
Expand Down

0 comments on commit c66fb61

Please sign in to comment.