From cb7bb8ecbd61d02fa3367f72bf01453379a1ddb4 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Fri, 9 Jun 2017 20:20:24 -0500 Subject: [PATCH 1/2] [2.7] bpo-30417: Disable `cpu` resource on AppVeyor (GH-1951). (cherry picked from commit 42e3acda86829def9adc354fbee77597b849bf9e) --- .github/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/appveyor.yml b/.github/appveyor.yml index fc325e5618b6521..f18986291b1d694 100644 --- a/.github/appveyor.yml +++ b/.github/appveyor.yml @@ -8,7 +8,7 @@ branches: build_script: - cmd: PCbuild\build.bat -e test_script: -- cmd: PCbuild\rt.bat -q -uall -rwW --slowest -j2 +- cmd: PCbuild\rt.bat -q -uall -u-cpu - -rwW --slowest -j2 # Only trigger AppVeyor if actual code or its configuration changes only_commits: From a8e672ff4169070ba4df4f0838351e24a67013ce Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Fri, 9 Jun 2017 21:32:30 -0500 Subject: [PATCH 2/2] Fix merge error --- .github/appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/appveyor.yml b/.github/appveyor.yml index f18986291b1d694..2f904cacd942716 100644 --- a/.github/appveyor.yml +++ b/.github/appveyor.yml @@ -8,7 +8,7 @@ branches: build_script: - cmd: PCbuild\build.bat -e test_script: -- cmd: PCbuild\rt.bat -q -uall -u-cpu - -rwW --slowest -j2 +- cmd: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest -j2 # Only trigger AppVeyor if actual code or its configuration changes only_commits: