Skip to content

Commit

Permalink
windows/appveyor: Build both standard and dev variants.
Browse files Browse the repository at this point in the history
This makes sure changes from previous related commits actually work.
  • Loading branch information
stinos authored and dpgeorge committed Jan 4, 2022
1 parent 19d949a commit 3f16719
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
15 changes: 13 additions & 2 deletions ports/windows/.appveyor.yml
Expand Up @@ -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
Expand All @@ -18,6 +22,12 @@ platform:
- x86
- x64

matrix:
# One debug build is enough.
exclude:
- configuration: Debug
PyVariant: dev

before_build:
- ps: |
@"
Expand All @@ -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) {
Expand All @@ -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"
}
Expand All @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions ports/windows/msvc/common.props
Expand Up @@ -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)
Expand Down

0 comments on commit 3f16719

Please sign in to comment.