From 890a460e9a44783f29e80044d46f493009dacb60 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Tue, 25 Feb 2025 19:31:13 +0100
Subject: [PATCH] drop http3 changes in favour of a sep PR

---
 .github/workflows/http3-linux.yml | 37 +++++++++++++++----------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml
index f6055ee470..00ddca4fb5 100644
--- a/.github/workflows/http3-linux.yml
+++ b/.github/workflows/http3-linux.yml
@@ -434,47 +434,46 @@ jobs:
             export PKG_CONFIG_PATH="${{ matrix.build.PKG_CONFIG_PATH }}"
           fi
           if [ -n '${{ matrix.build.generate }}' ]; then
-            cmake -B bld -G Ninja \
+            cmake -B . -G Ninja \
               -DCMAKE_C_COMPILER_TARGET=$(uname -m)-pc-linux-gnu -DBUILD_STATIC_LIBS=ON \
               -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON \
               ${{ matrix.build.generate }}
           else
-            mkdir bld && cd bld && ../configure --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
-              --disable-dependency-tracking \
+            ./configure --disable-dependency-tracking --enable-unity --enable-test-bundles --enable-warnings --enable-werror \
               ${{ matrix.build.configure }}
           fi
 
       - name: 'configure log'
         if: ${{ !cancelled() }}
-        run: cat bld/config.log bld/CMakeFiles/CMakeConfigureLog.yaml 2>/dev/null || true
+        run: cat config.log CMakeFiles/CMakeConfigureLog.yaml 2>/dev/null || true
 
       - name: 'curl_config.h'
         run: |
-          echo '::group::raw'; cat bld/lib/curl_config.h || true; echo '::endgroup::'
-          grep -F '#define' bld/lib/curl_config.h | sort || true
+          echo '::group::raw'; cat lib/curl_config.h || true; echo '::endgroup::'
+          grep -F '#define' lib/curl_config.h | sort || true
 
       - name: 'test configs'
         run: |
-          cat bld/tests/config || true
-          cat bld/tests/http/config.ini || true
+          cat tests/config || true
+          cat tests/http/config.ini || true
 
       - name: 'build'
         run: |
           if [ -n '${{ matrix.build.generate }}' ]; then
-            cmake --build bld --verbose
+            cmake --build . --verbose
           else
-            make -C bld V=1
+            make V=1
           fi
 
       - name: 'check curl -V output'
-        run: bld/src/curl -V
+        run: ./src/curl -V
 
       - name: 'build tests'
         run: |
           if [ -n '${{ matrix.build.generate }}' ]; then
-            cmake --build bld --verbose --target testdeps
+            cmake --build . --verbose --target testdeps
           else
-            make -C bld V=1 -C tests
+            make V=1 -C tests
           fi
 
       - name: 'install test prereqs'
@@ -488,9 +487,9 @@ jobs:
         run: |
           source $HOME/venv/bin/activate
           if [ -n '${{ matrix.build.generate }}' ]; then
-            cmake --build bld --verbose --target test-ci
+            cmake --build . --verbose --target test-ci
           else
-            make -C bld V=1 test-ci
+            make V=1 test-ci
           fi
 
       - name: 'install pytest prereqs'
@@ -507,15 +506,15 @@ jobs:
         run: |
           source $HOME/venv/bin/activate
           if [ -n '${{ matrix.build.generate }}' ]; then
-            cmake --build bld --verbose --target curl-pytest-ci
+            cmake --build . --verbose --target curl-pytest-ci
           else
-            make -C bld V=1 pytest-ci
+            make V=1 pytest-ci
           fi
 
       - name: 'build examples'
         run: |
           if [ -n '${{ matrix.build.generate }}' ]; then
-            cmake --build bld --verbose --target curl-examples
+            cmake --build . --verbose --target curl-examples
           else
-            make -C bld V=1 examples
+            make V=1 examples
           fi