fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

windows/appveyor: Build both standard and dev variants.

Browse Source 
This makes sure changes from previous related commits actually work.
This commit is contained in:
stijn 2021-11-25 16:50:10 +01:00 committed by Damien George
parent 19d949a866
commit 3f16719888
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ports/windows/.appveyor.yml
View File

@ -5,6 +5,10 @@ skip_tags: true
environment: environment:
# Python version used # Python version used
MICROPY_CPYTHON3: c:/python38/python.exe MICROPY_CPYTHON3: c:/python38/python.exe
# The variants.
matrix:
- PyVariant: dev
- PyVariant: standard
init: init:
# Set build version number to commit to be travis-like # Set build version number to commit to be travis-like
@ -18,6 +22,12 @@ platform:
- x86 - x86
- x64 - x64
matrix:
# One debug build is enough.
exclude:
- configuration: Debug
PyVariant: dev
before_build: before_build:
- ps: | - ps: |
@" @"
@ -36,6 +46,7 @@ build:
test_script: test_script:
- ps: | - ps: |
$env:MICROPY_MICROPYTHON=(msbuild ports\windows\micropython.vcxproj /nologo /v:m /t:ShowTargetPath).Trim()
cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests') cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests')
& $env:MICROPY_CPYTHON3 run-tests.py & $env:MICROPY_CPYTHON3 run-tests.py
if ($LASTEXITCODE -ne 0) { if ($LASTEXITCODE -ne 0) {
@ -58,7 +69,7 @@ after_test:
$env:MSYSTEM = if ($platform -eq 'x86') {'MINGW32'} else {'MINGW64'} $env:MSYSTEM = if ($platform -eq 'x86') {'MINGW32'} else {'MINGW64'}
$env:CHERE_INVOKING = 'enabled_from_arguments' $env:CHERE_INVOKING = 'enabled_from_arguments'
cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'ports/windows') cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'ports/windows')
C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1" C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1 VARIANT=$($env:PyVariant)"
if ($LASTEXITCODE -ne 0) { if ($LASTEXITCODE -ne 0) {
throw "$env:MSYSTEM build exited with code $LASTEXITCODE" throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
} }
@ -68,7 +79,7 @@ after_test:
throw "$env:MSYSTEM mpy_cross build exited with code $LASTEXITCODE" throw "$env:MSYSTEM mpy_cross build exited with code $LASTEXITCODE"
} }
cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'ports/windows') cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'ports/windows')
C:\msys64\usr\bin\bash.exe -l -c "make V=1 test_full" C:\msys64\usr\bin\bash.exe -l -c "make V=1 test_full VARIANT=$($env:PyVariant)"
if ($LASTEXITCODE -ne 0) { if ($LASTEXITCODE -ne 0) {
& $env:MICROPY_CPYTHON3 run-tests.py --print-failures & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
throw "Test failure" throw "Test failure"

5
ports/windows/msvc/common.props
View File

@ -42,6 +42,11 @@
<QstrDependencies Include="$(PyVariantDir)mpconfigvariant.h"/> <QstrDependencies Include="$(PyVariantDir)mpconfigvariant.h"/>
</ItemGroup> </ItemGroup>
<!-- Helper for getting resulting executable path since it depends on other properties. -->
<Target Name="ShowTargetPath">
<Message Text="$(TargetPath)" Importance="high"/>
</Target>
<!-- Copy PyOutputFiles to their target destination. <!-- Copy PyOutputFiles to their target destination.
To force this when switching between platforms/configurations which are already up-to-date (and as such, To force this when switching between platforms/configurations which are already up-to-date (and as such,
for which a build wouldn't even start because all outputs are effectively newer than the inputs) for which a build wouldn't even start because all outputs are effectively newer than the inputs)