From d15b76ad923e24cc451b3ec3e5298d453fb273c4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 23 Mar 2021 14:59:53 +0100
Subject: [PATCH] Get rid of separate "Launching httpbin" step in the CI builds

Just do it as part of "Testing".
---
 .github/workflows/ci.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a24f37a6d4..02faedaabb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -187,17 +187,15 @@ 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
         working-directory: tests
         run: |
+          echo "Launching httpbin"
+          pip install httpbin
+          python -m httpbin.core 2>&1 >httpbin.log &
+          export WX_TEST_WEBREQUEST_URL=http://localhost:5000
+
           # Explicitly use bash because /bin/sh doesn't have pipefail option
           /bin/bash -o pipefail -c './test 2>&1 | tee test.out' || rc=$?
           if [ ${{ matrix.use_asan }} ]; then