From 69f64b67e43c65c2178c865fd1be80ed07f02d3c Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Tue, 8 Jan 2019 02:56:14 -0800 Subject: bpo-35596: Use unchecked PYCs for the embeddable distro to avoid zipimport restrictions (GH-11465) Also adds extra steps to the CI build for Windows on Azure Pipelines to validate that the various layouts at least execute. (cherry picked from commit 872bd2b57ce8e4ea7a54acb3934222c0e4e7276b) Co-authored-by: Steve Dower --- .azure-pipelines/ci.yml | 10 ++++++++++ .azure-pipelines/windows-layout-steps.yml | 11 +++++++++++ 2 files changed, 21 insertions(+) create mode 100644 .azure-pipelines/windows-layout-steps.yml (limited to '.azure-pipelines') diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index 49a7bb6232..78075bcfc1 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -134,3 +134,13 @@ jobs: steps: - template: ./windows-steps.yml + + - template: ./windows-layout-steps.yml + parameters: + kind: nuget + - template: ./windows-layout-steps.yml + parameters: + kind: embed + - template: ./windows-layout-steps.yml + parameters: + kind: appx diff --git a/.azure-pipelines/windows-layout-steps.yml b/.azure-pipelines/windows-layout-steps.yml new file mode 100644 index 0000000000..62e5259375 --- /dev/null +++ b/.azure-pipelines/windows-layout-steps.yml @@ -0,0 +1,11 @@ +parameters: + kind: nuget + extraOpts: --precompile + +steps: +- script: .\python.bat PC\layout -vv -s "$(Build.SourcesDirectory)" -b "$(Py_OutDir)\$(arch)" -t "$(Py_IntDir)\layout-tmp-${{ parameters['kind'] }}-$(arch)" --copy "$(Py_OutDir)\layout-${{ parameters['kind'] }}-$(arch)" ${{ parameters['extraOpts'] }} --preset-${{ parameters['kind'] }} --include-tests + displayName: Create ${{ parameters['kind'] }} layout + +- script: .\python.exe -m test.pythoninfo + workingDirectory: $(Py_OutDir)\layout-${{ parameters['kind'] }}-$(arch) + displayName: Show layout info (${{ parameters['kind'] }}) -- cgit v1.2.1