Skip to content

Commit e186d4b

Browse files
josesimoesjosesimoes
authored
Improvements in AppVeyor (#531)
1 parent 91b90d2 commit e186d4b

File tree

3 files changed

+30
-28
lines changed

3 files changed

+30
-28
lines changed

‎appveyor.yml‎

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,20 @@
4848
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
4949
- BOARD_NAME: 'MBN_QUAIL'
5050
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON'
51-
NEEDS_DFU: '$True'
51+
NEEDS_DFU: 'True'
5252
- BOARD_NAME: 'ST_STM32F769I_DISCOVERY'
5353
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
5454
- BOARD_NAME: 'NETDUINO3_WIFI'
5555
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
56-
NEEDS_DFU: '$True'
57-
56+
NEEDS_DFU: 'True'
5857

5958
matrix:
6059
fast_finish: true
6160

6261
cache:
63-
- C:\ProgramData\chocolatey\bin -> appveyor.yml
64-
- C:\ProgramData\chocolatey\lib -> appveyor.yml
65-
- vendor/bundle
66-
- '%GNU_GCC_TOOLCHAIN_PATH%'
67-
- '%NINJA_PATH%'
68-
- '%HEX2DFU_PATH%'
62+
- '%GNU_GCC_TOOLCHAIN_PATH% -> appveyor.yml'
63+
- '%NINJA_PATH% -> appveyor.yml'
64+
- '%HEX2DFU_PATH% -> appveyor.yml'
6965

7066
install:
7167
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
@@ -96,9 +92,9 @@
9692
$splitOption = [System.StringSplitOptions]::RemoveEmptyEntries
9793
$cmakeOptions = $env:BUILD_OPTIONS.Split($separator, $splitOption)
9894
99-
If($env:NEEDS_DFU -eq $True)
95+
If($env:NEEDS_DFU -eq 'True')
10096
{
101-
$cmakeOptions += "-DTOOL_HEX2DFU_PREFIX=$env:HEX2DFU_PATH"
97+
$cmakeOptions += "-DTOOL_HEX2DFU_PREFIX=$env:HEX2DFU_PATH".Replace('\','/')
10298
}
10399
104100
&$cmake -G Ninja "-DTOOLCHAIN_PREFIX=$env:GNU_GCC_TOOLCHAIN_PATH" "-DCHIBIOS_BOARD=$env:BOARD_NAME" "-DCMAKE_BUILD_TYPE=$env:CONFIGURATION" $cmakeOptions ..
@@ -200,12 +196,12 @@
200196
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
201197
- BOARD_NAME: 'MBN_QUAIL'
202198
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON'
203-
NEEDS_DFU: $True
199+
NEEDS_DFU: 'True'
204200
- BOARD_NAME: 'ST_STM32F769I_DISCOVERY'
205201
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
206202
- BOARD_NAME: 'NETDUINO3_WIFI'
207203
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
208-
NEEDS_DFU: $True
204+
NEEDS_DFU: 'True'
209205
- BOARD_NAME: 'NANOCLR_WINDOWS'
210206

211207
matrix:
@@ -218,10 +214,9 @@
218214
cache:
219215
- C:\ProgramData\chocolatey\bin -> appveyor.yml
220216
- C:\ProgramData\chocolatey\lib -> appveyor.yml
221-
- vendor/bundle
222-
- '%GNU_GCC_TOOLCHAIN_PATH%'
223-
- '%NINJA_PATH%'
224-
- '%HEX2DFU_PATH%'
217+
- '%GNU_GCC_TOOLCHAIN_PATH% -> appveyor.yml'
218+
- '%NINJA_PATH% -> appveyor.yml'
219+
- '%HEX2DFU_PATH% -> appveyor.yml'
225220

226221
install:
227222
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
@@ -265,9 +260,9 @@
265260
$splitOption = [System.StringSplitOptions]::RemoveEmptyEntries
266261
$cmakeOptions = $env:BUILD_OPTIONS.Split($separator, $splitOption)
267262
268-
If($env:NEEDS_DFU -eq $True)
263+
If($env:NEEDS_DFU -eq 'True')
269264
{
270-
$cmakeOptions += "-DTOOL_HEX2DFU_PREFIX=$env:HEX2DFU_PATH"
265+
$cmakeOptions += "-DTOOL_HEX2DFU_PREFIX=$env:HEX2DFU_PATH".Replace('\','/')
271266
}
272267
273268
&$cmake -G Ninja "-DTOOLCHAIN_PREFIX=$env:GNU_GCC_TOOLCHAIN_PATH" "-DCHIBIOS_BOARD=$env:BOARD_NAME" "-DCMAKE_BUILD_TYPE=$env:CONFIGURATION" $cmakeOptions "-DBUILD_VERSION=$env:GitVersion_AssemblySemVer" ..
@@ -373,23 +368,22 @@
373368
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=OFF'
374369
- BOARD_NAME: 'MBN_QUAIL'
375370
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON'
376-
NEEDS_DFU: $True
371+
NEEDS_DFU: 'True'
377372
- BOARD_NAME: 'ST_STM32F769I_DISCOVERY'
378373
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F7xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
379374
- BOARD_NAME: 'NETDUINO3_WIFI'
380375
BUILD_OPTIONS: '-DTARGET_SERIES=STM32F4xx -DUSE_FPU=TRUE -DNF_FEATURE_DEBUGGER=TRUE -DSWO_OUTPUT=OFF -DNF_FEATURE_RTC=ON -DAPI_Windows.Devices.Gpio=ON'
381-
NEEDS_DFU: $True
376+
NEEDS_DFU: 'True'
382377

383378
matrix:
384379
fast_finish: true
385380

386381
cache:
387382
- C:\ProgramData\chocolatey\bin -> appveyor.yml
388383
- C:\ProgramData\chocolatey\lib -> appveyor.yml
389-
- vendor/bundle
390-
- '%GNU_GCC_TOOLCHAIN_PATH%'
391-
- '%NINJA_PATH%'
392-
- '%HEX2DFU_PATH%'
384+
- '%GNU_GCC_TOOLCHAIN_PATH% -> appveyor.yml'
385+
- '%NINJA_PATH% -> appveyor.yml'
386+
- '%HEX2DFU_PATH% -> appveyor.yml'
393387

394388
install:
395389
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
@@ -420,9 +414,9 @@
420414
$splitOption = [System.StringSplitOptions]::RemoveEmptyEntries
421415
$cmakeOptions = $env:BUILD_OPTIONS.Split($separator, $splitOption)
422416
423-
If($env:NEEDS_DFU -eq $True)
417+
If($env:NEEDS_DFU -eq 'True')
424418
{
425-
$cmakeOptions += "-DTOOL_HEX2DFU_PREFIX=$env:HEX2DFU_PATH"
419+
$cmakeOptions += "-DTOOL_HEX2DFU_PREFIX=$env:HEX2DFU_PATH".Replace('\','/')
426420
}
427421
428422
&$cmake -G Ninja "-DTOOLCHAIN_PREFIX=$env:GNU_GCC_TOOLCHAIN_PATH" "-DCHIBIOS_BOARD=$env:BOARD_NAME" "-DCMAKE_BUILD_TYPE=$env:CONFIGURATION" $cmakeOptions "-DBUILD_VERSION=$env:GitVersion_AssemblySemVer" ..

‎install-arm-gcc-toolchain.ps1‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ If($GnuGccPathExists -eq $False)
1616

1717
# unzip toolchain
1818
Expand-Archive $output -DestinationPath $env:GNU_GCC_TOOLCHAIN_PATH
19+
20+
# delete the samples and docs folder
21+
$toDelete = $env:GNU_GCC_TOOLCHAIN_PATH + '\share'
22+
Remove-Item -Recurse -Force $toDelete
1923
}

‎install-nf-hex2dfu.ps1‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ $hex2dfuPathExists = Test-Path $env:HEX2DFU_PATH -ErrorAction SilentlyContinue
55

66
If($hex2dfuPathExists -eq $False)
77
{
8+
md $($env:HEX2DFU_PATH)
9+
810
Write-Host "Downloading hex2dfu..."
911

1012
$url = "https://github.com/nanoframework/nf-tools/releases/download/v1.0.0/hex2dfu.exe"
1113

14+
$output = "$env:HEX2DFU_PATH\hex2dfu.exe"
15+
1216
# download executable with utility
13-
(New-Object Net.WebClient).DownloadFile($url, $env:HEX2DFU_PATH)
17+
(New-Object Net.WebClient).DownloadFile($url, $output)
1418
}

0 commit comments

Comments
 (0)