From 5e3464fcd6010d016d5d95eb7310e6c5ee88413d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 27 Jan 2021 23:58:58 +0100
Subject: [PATCH 1/3] Enable use of libcurl and test it using local httpbin
 instance

Libcurl was implicitly disabled by --disable-sys-libs, so enable it
explicitly to still use it.

Also install httpbin using pip to use it for wxWebRequest tests.
---
 .github/workflows/ci.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 18d57d8e25..37ba97e7b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
           - name: wxGTK Ubuntu 20.04 with ASAN
             runner: ubuntu-20.04
             compiler: gcc
-            configure_flags: --disable-compat30 --disable-sys-libs
+            configure_flags: --disable-compat30 --disable-sys-libs --with-libcurl
             gtk_version: 3
             skip_samples: true
             use_asan: true
@@ -119,13 +119,27 @@ jobs:
           fi
           make -k -C tests $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
 
+      - name: Launching httpbin
+        if: matrix.skip_testing != true
+        run: |
+          pip install httpbin
+          python -m httpbin.core 2>&1 >httpbin.log &
+          echo 'WX_TEST_WEBREQUEST_URL=http://localhost:5000' >> $GITHUB_ENV
+
       - name: Testing
         if: matrix.skip_testing != true
         run: |
           echo 'Testing...'
           pushd tests
-          ./test
+          ./test || rc=$?
           popd
+          if [ -n "$rc" ]; then
+            echo '*** Tests failed, contents of httpbin.log follows: ***'
+            echo '-----------------------------------------------------------'
+            cat httpbin.log
+            echo '-----------------------------------------------------------'
+            exit $rc
+          fi
 
       - name: Testing GUI using Xvfb
         if: matrix.skip_testing != true && matrix.skip_gui != true && matrix.use_xvfb

From f31a064848030e14727cbc853390001b58d1910e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 28 Jan 2021 00:04:39 +0100
Subject: [PATCH 2/3] Install libcurl to make it available in the CI builds

It's not installed by default at least on GitHub Actions images.
---
 build/tools/before_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/tools/before_install.sh b/build/tools/before_install.sh
index 08167e458a..374b5823ff 100755
--- a/build/tools/before_install.sh
+++ b/build/tools/before_install.sh
@@ -37,7 +37,7 @@ case $(uname -s) in
                             libglu1-mesa-dev"
             esac
 
-            extra_deps="$extra_deps libsecret-1-dev libnotify-dev"
+            extra_deps="$extra_deps libcurl4-openssl-dev libsecret-1-dev libnotify-dev"
             for pkg in $extra_deps; do
                 if $(apt-cache pkgnames | grep -q $pkg) ; then
                     pkg_install="$pkg_install $pkg"

From 52d63eedd21ff94842e095afc97d4d6d8c6058a7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 28 Jan 2021 17:33:26 +0100
Subject: [PATCH 3/3] Don't rerun CI builds for docs-only changes

Avoid running the builds unnecessarily.
---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 37ba97e7b0..bddc0b91c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,9 +5,15 @@ on:
   push:
     branches:
       - master
+    paths:
+      - '!docs'
+      - '!interface'
   pull_request:
     branches:
       - master
+    paths:
+      - '!docs'
+      - '!interface'
 
 jobs:
   build: