diff options
| author | stijn <stijn@ignitron.net> | 2021-11-25 16:50:10 +0100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-01-04 15:07:45 +1100 |
| commit | 3f16719888574ee6a45bbfc0e67e8d55ef0a0696 (patch) | |
| tree | 98450edcca49cad4d94829e61b04e8a645593cf4 | |
| parent | 19d949a866a9b2e3cfc2892f15edc92243405b1f (diff) | |
windows/appveyor: Build both standard and dev variants.
This makes sure changes from previous related commits actually work.
| -rw-r--r-- | ports/windows/.appveyor.yml | 15 | ||||
| -rw-r--r-- | ports/windows/msvc/common.props | 5 |
2 files changed, 18 insertions, 2 deletions
diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml index d412e0f16..e249aafdf 100644 --- a/ports/windows/.appveyor.yml +++ b/ports/windows/.appveyor.yml @@ -5,6 +5,10 @@ skip_tags: true environment: # Python version used MICROPY_CPYTHON3: c:/python38/python.exe + # The variants. + matrix: + - PyVariant: dev + - PyVariant: standard init: # Set build version number to commit to be travis-like @@ -18,6 +22,12 @@ platform: - x86 - x64 +matrix: + # One debug build is enough. + exclude: + - configuration: Debug + PyVariant: dev + before_build: - ps: | @" @@ -36,6 +46,7 @@ build: test_script: - ps: | + $env:MICROPY_MICROPYTHON=(msbuild ports\windows\micropython.vcxproj /nologo /v:m /t:ShowTargetPath).Trim() cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests') & $env:MICROPY_CPYTHON3 run-tests.py if ($LASTEXITCODE -ne 0) { @@ -58,7 +69,7 @@ after_test: $env:MSYSTEM = if ($platform -eq 'x86') {'MINGW32'} else {'MINGW64'} $env:CHERE_INVOKING = 'enabled_from_arguments' 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) { throw "$env:MSYSTEM build exited with code $LASTEXITCODE" } @@ -68,7 +79,7 @@ after_test: throw "$env:MSYSTEM mpy_cross build exited with code $LASTEXITCODE" } 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) { & $env:MICROPY_CPYTHON3 run-tests.py --print-failures throw "Test failure" diff --git a/ports/windows/msvc/common.props b/ports/windows/msvc/common.props index ab9b055de..7d608a379 100644 --- a/ports/windows/msvc/common.props +++ b/ports/windows/msvc/common.props @@ -42,6 +42,11 @@ <QstrDependencies Include="$(PyVariantDir)mpconfigvariant.h"/> </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. 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) |