Skip to content

Commit d424e41

Browse files
committed
Work CI-CD
- Improve download and usage of specific nanoCLR from nf-interpreter build.
1 parent 5345bb8 commit d424e41

File tree

3 files changed

+35
-4
lines changed

3 files changed

+35
-4
lines changed

azure-pipelines-templates/check-nf-interpreter-to-test.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,13 @@ steps:
6060
allowFailedBuilds: true
6161
buildId: $(NFINTERPRETER_BUILDID)
6262
artifactName: 'nanoclr_cli'
63-
targetPath: '$(Pipeline.Workspace)/nanoclr'
63+
targetPath: '$(Agent.TempDirectory)/nanoclr_cli'
6464

6565
- task: PowerShell@2
6666
condition: ne(variables['NFINTERPRETER_BUILDID'], '')
67-
displayName: Set nanoCLR preview path
67+
displayName: Flag availability of local nanoCLR
68+
name: NANOCLR_CHECK
6869
inputs:
6970
targetType: 'inline'
7071
script: |
71-
Write-Host "##vso[task.setvariable variable=NF_MDP_NANOCLR_INSTANCE_PATH]$(Pipeline.Workspace)/nanoclr/nanoFramework.nanoCLR.dll"
72+
Write-Host "##vso[task.setvariable variable=HAS_LOCAL_NANOCLR;isOutput=true]true"

azure-pipelines.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,26 @@ jobs:
7171

7272
- template: azure-pipelines-templates/check-nf-interpreter-to-test.yml
7373

74+
- task: PowerShell@2
75+
displayName: Set unit test runsettings path
76+
inputs:
77+
targetType: 'inline'
78+
script: |
79+
$hasLocalNanoClr = $env:NANOCLR_CHECK_HAS_LOCAL_NANOCLR
80+
if ($hasLocalNanoClr -eq 'true') {
81+
Write-Host "##vso[task.setvariable variable=UNIT_TEST_RUNSETTINGS]$(System.DefaultWorkingDirectory)\local_clr.runsettings"
82+
} else {
83+
Write-Host "##vso[task.setvariable variable=UNIT_TEST_RUNSETTINGS]$(System.DefaultWorkingDirectory)\.runsettings"
84+
}
85+
env:
86+
HAS_LOCAL_NANOCLR: $[ dependencies['check-nf-interpreter-to-test'].outputs['Flag_availability_of_local_nanoCLR.HAS_LOCAL_NANOCLR'] ]
87+
7488
# build steps only
7589
- template: azure-pipelines-templates/class-lib-build-only.yml@templates
7690
parameters:
7791
sonarCloudProject: 'nanoframework_lib-CoreLibrary'
7892
runUnitTests: ${{ ne(variables['processPrLabels.SKIP_UNIT_TESTS'], 'true') }}
79-
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\.runsettings'
93+
unitTestRunsettings: $(UNIT_TEST_RUNSETTINGS)
8094
skipNuGetCache: true
8195
usePreviewBuild: true
8296

local_clr.runsettings

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RunSettings>
3+
<!-- Configurations that affect the Test Framework -->
4+
<RunConfiguration>
5+
<MaxCpuCount>1</MaxCpuCount>
6+
<ResultsDirectory>.\TestResults</ResultsDirectory><!-- Path relative to solution directory -->
7+
<TestSessionTimeout>1200000</TestSessionTimeout><!-- Milliseconds -->
8+
<TargetFrameworkVersion>net48</TargetFrameworkVersion>
9+
<TargetPlatform>x64</TargetPlatform>
10+
</RunConfiguration>
11+
<nanoFrameworkAdapter>
12+
<Logging>Verbose</Logging>
13+
<IsRealHardware>False</IsRealHardware>
14+
<PathToLocalCLRInstance>D:\a\_temp\nanoclr_cli\nanoFramework.nanoCLR.dll</PathToLocalCLRInstance>
15+
</nanoFrameworkAdapter>
16+
</RunSettings>

0 commit comments

Comments
 (0)