jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/464146 )
Change subject: .appveyor.yml: Fix and cleanup the matrix ...................................................................... .appveyor.yml: Fix and cleanup the matrix - environment variables are global, no need to use "global:" key (old syntax). - Combine the same on_success and on_failure into on_finish. - Mixing key-value pairs with lists is not allowed in yaml syntax. Move `fast_finish: true` to a separate matrix. Change-Id: I185847ce33dd653d3b7211622ca8038f5aa16230 --- M .appveyor.yml 1 file changed, 13 insertions(+), 14 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 23c5f08..aa5f763 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,21 +1,19 @@ clone_depth: 50 environment: - global: - APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/ogrisel/python-appveyor-demo/master/appveyor/"; + APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/ogrisel/python-appveyor-demo/master/appveyor/"; - # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script interpreter - # See: http://stackoverflow.com/a/13751649/163740 - CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd" + # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the + # /E:ON and /V:ON options are not enabled in the batch script interpreter + # See: http://stackoverflow.com/a/13751649/163740 + CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd" - PYWIKIBOT_DIR: "%appdata%\\Pywikibot" - PYWIKIBOT_USER_CONFIG: "%appdata%\\Pywikibot\\user-config.py" + PYWIKIBOT_DIR: "%appdata%\\Pywikibot" + PYWIKIBOT_USER_CONFIG: "%appdata%\\Pywikibot\\user-config.py" - PYSETUP_TEST_EXTRAS: "1" + PYSETUP_TEST_EXTRAS: "1" matrix: - fast_finish: true # Test the lowest supported release of each major Python version. @@ -68,6 +66,10 @@ - PYTHON: "C:\\Python36-x64" PYTHON_VERSION: "3.6.x" PYTHON_ARCH: "64" + +matrix: + fast_finish: true + init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" @@ -101,10 +103,7 @@ - set PYSETUP_TEST_NO_UI=1 - "%CMD_IN_ENV% coverage run setup.py test" -on_failure: - - codecov - -on_success: +on_finish: - codecov artifacts: -- To view, visit https://gerrit.wikimedia.org/r/464146 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I185847ce33dd653d3b7211622ca8038f5aa16230 Gerrit-Change-Number: 464146 Gerrit-PatchSet: 4 Gerrit-Owner: Dalba <[email protected]> Gerrit-Reviewer: Dvorapa <[email protected]> Gerrit-Reviewer: John Vandenberg <[email protected]> Gerrit-Reviewer: jenkins-bot (75)
_______________________________________________ Pywikibot-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
