From 9dc676a32c08a915e7bbb6e64bef7627f3e8fcdb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 15 Feb 2021 16:04:51 +0100
Subject: [PATCH 1/2] Don't run GitHub CI action when other CI scripts change

Avoid wasting resources when only the scripts used with AppVeyor or
Travis CI change.
---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0f5f0075a..485034dd56 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,6 +6,9 @@ on:
     branches:
       - master
     paths-ignore:
+      - 'build/tools/appveyor*.bat'
+      - 'build/tools/before_install.sh'
+      - 'build/tools/travis-ci.sh'
       - 'distrib/**'
       - 'docs/**'
       - 'interface/**'
@@ -15,6 +18,9 @@ on:
     branches:
       - master
     paths-ignore:
+      - 'build/tools/appveyor*.bat'
+      - 'build/tools/before_install.sh'
+      - 'build/tools/travis-ci.sh'
       - 'distrib/**'
       - 'docs/**'
       - 'interface/**'

From e848c54f0fd864545f3e3f14c79f9e59a87bf9d3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 15 Feb 2021 16:05:43 +0100
Subject: [PATCH 2/2] Use pip for installing httpbin in most Travis CI builds

Using docker results in errors due to rate limit on pulling, so try to
reduce its use as much as possible. It still has to be used under Ubuntu
14.04 because it has a version of Python too old to work with HTTPS
servers using SNI and so using pip fails there.
---
 .travis.yml              | 2 +-
 build/tools/travis-ci.sh | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c1e8519c52..cfcec4ace3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ jobs:
     include:
         - dist: trusty
           compiler: gcc
-          env: wxGTK_VERSION=2 wxUSE_XVFB=1
+          env: wxGTK_VERSION=2 wxUSE_XVFB=1 wxUSE_DOCKER_HTTPBIN=1
           name: wxGTK 2 Ubuntu 14.04
         - dist: bionic
           compiler: gcc
diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh
index a91947b1dc..18dbcc0d0d 100755
--- a/build/tools/travis-ci.sh
+++ b/build/tools/travis-ci.sh
@@ -16,10 +16,9 @@ launch_httpbin() {
     echo 'travis_fold:start:httpbin'
     echo 'Running httpbin...'
 
-    # Prefer to use docker if it's available as it's more robust than dealing
-    # with pip -- but we need to have a fallback as at least Mac builds don't
-    # have docker.
-    if command -v docker; then
+    # Use docker if configured to do so, this works around Python/pip problems
+    # on some platforms.
+    if [ "$wxUSE_DOCKER_HTTPBIN" = 1 ]; then
         docker pull kennethreitz/httpbin
         docker run -d -p 80:80 kennethreitz/httpbin
         WX_TEST_WEBREQUEST_URL="http://localhost"