]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
CI ngtcp2+quictls: use nghttpx cache as in quiche build
authorStefan Eissing <stefan@eissing.org>
Thu, 27 Jul 2023 07:55:36 +0000 (09:55 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Thu, 27 Jul 2023 14:59:37 +0000 (16:59 +0200)
.github/workflows/ngtcp2-gnutls.yml [deleted file]
.github/workflows/ngtcp2-linux.yml [new file with mode: 0644]
.github/workflows/ngtcp2-quictls.yml [deleted file]
.github/workflows/ngtcp2-wolfssl.yml [deleted file]
tests/http/test_02_download.py

diff --git a/.github/workflows/ngtcp2-gnutls.yml b/.github/workflows/ngtcp2-gnutls.yml
deleted file mode 100644 (file)
index 960837e..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-name: ngtcp2 GnuTLS
-
-on:
-  push:
-    branches:
-    - master
-    - '*/ci'
-    paths-ignore:
-    - '**/*.md'
-    - '**/CMakeLists.txt'
-    - '.azure-pipelines.yml'
-    - '.circleci/**'
-    - '.cirrus.yml'
-    - 'appveyor.yml'
-    - 'CMake/**'
-    - 'packages/**'
-    - 'plan9/**'
-    - 'projects/**'
-    - 'winbuild/**'
-  pull_request:
-    branches:
-    - master
-    paths-ignore:
-    - '**/*.md'
-    - '**/CMakeLists.txt'
-    - '.azure-pipelines.yml'
-    - '.circleci/**'
-    - '.cirrus.yml'
-    - 'appveyor.yml'
-    - 'CMake/**'
-    - 'packages/**'
-    - 'plan9/**'
-    - 'projects/**'
-    - 'winbuild/**'
-
-concurrency:
-  # Hardcoded workflow filename as workflow name above is just Linux again
-  group: ngtcp2-gnutls-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-permissions: {}
-
-env:
-  MAKEFLAGS: -j 3
-
-jobs:
-  autotools:
-    name: ${{ matrix.build.name }}
-    runs-on: 'ubuntu-latest'
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        build:
-        - name: gnutls
-          install: >-
-            libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev
-            nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin
-            libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools
-            texinfo texlive texlive-extra-utils autopoint libev-dev
-          configure: >-
-            PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib"
-            --with-ngtcp2=$HOME/all --enable-warnings --enable-werror --enable-debug
-            --with-test-nghttpx="$HOME/all/bin/nghttpx"
-          ngtcp2-configure: >-
-            --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
-          gnutls-configure: >-
-            PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib -L$HOME/all/lib"
-            --with-included-libtasn1 --with-included-unistring
-            --disable-guile --disable-doc --disable-tests --disable-tools
-
-    steps:
-    - run: |
-        sudo apt-get update
-        sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }}
-        sudo apt-get install apache2 apache2-dev
-      name: 'install prereqs and impacket, pytest, crypto'
-
-    - run: |
-        git clone --quiet --depth=1 -b openssl-3.0.9+quic https://github.com/quictls/openssl
-        cd openssl
-        ./config --prefix=$HOME/all --libdir=$HOME/all/lib
-        make -j1 install_sw
-      name: 'install quictls'
-
-    - run: |
-        git clone --quiet --depth=1 https://gitlab.com/gnutls/nettle.git
-        cd nettle
-        ./.bootstrap
-        ./configure LDFLAGS="-Wl,-rpath,$HOME/all/lib" ${{ matrix.build.nettle-configure }} --prefix=$HOME/all --libdir=$HOME/all/lib --disable-documentation
-        make install
-      name: 'install nettle'
-
-    - run: |
-        git clone --quiet --depth=1 -b 3.8.0 https://github.com/gnutls/gnutls.git
-        cd gnutls
-        ./bootstrap
-        ./configure ${{ matrix.build.gnutls-configure }} --prefix=$HOME/all
-        make install
-      name: 'install gnutls'
-
-    - run: |
-        git clone --quiet --depth=1 -b v0.13.0 https://github.com/ngtcp2/nghttp3
-        cd nghttp3
-        autoreconf -fi
-        ./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
-        make install
-      name: 'install nghttp3'
-
-    - run: |
-        git clone --quiet --depth=1 -b v0.17.0 https://github.com/ngtcp2/ngtcp2
-        cd ngtcp2
-        autoreconf -fi
-        ./configure ${{ matrix.build.ngtcp2-configure }} --with-openssl --with-gnutls
-        make install
-      name: 'install ngtcp2'
-
-    - run: |
-        git clone --quiet --depth=1 -b v1.55.1 https://github.com/nghttp2/nghttp2
-        cd nghttp2
-        autoreconf -fi
-        ./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-http3
-        make install
-      name: 'install nghttp2'
-
-    - run: |
-        git clone --quiet --depth=1 -b master https://github.com/icing/mod_h2
-        cd mod_h2
-        autoreconf -fi
-        ./configure PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig"
-        make
-        sudo make install
-      name: 'install mod_h2'
-
-    - uses: actions/checkout@v3
-
-    - run: |
-        sudo python3 -m pip install -r tests/requirements.txt -r tests/http/requirements.txt
-      name: 'install python test prereqs'
-
-    - run: autoreconf -fi
-      name: 'autoreconf'
-
-    - run: ./configure --with-gnutls=$HOME/all ${{ matrix.build.configure }}
-      name: 'configure'
-
-    - run: make V=1
-      name: 'make'
-
-    - run: make V=1 examples
-      name: 'make examples'
-
-    - run: make V=1 -C tests
-      name: 'make tests'
-
-    - run: make V=1 test-ci
-      name: 'run tests'
-      env:
-        TFLAGS: "${{ matrix.build.tflags }}"
-
-    - run: pytest -v
-      name: 'run pytest'
-      env:
-        TFLAGS: "${{ matrix.build.tflags }}"
diff --git a/.github/workflows/ngtcp2-linux.yml b/.github/workflows/ngtcp2-linux.yml
new file mode 100644 (file)
index 0000000..d14872c
--- /dev/null
@@ -0,0 +1,199 @@
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+
+name: ngtcp2-linux
+
+on:
+  push:
+    branches:
+    - master
+    - '*/ci'
+    paths-ignore:
+    - '**/*.md'
+    - '**/CMakeLists.txt'
+    - '.azure-pipelines.yml'
+    - '.circleci/**'
+    - '.cirrus.yml'
+    - 'appveyor.yml'
+    - 'CMake/**'
+    - 'packages/**'
+    - 'plan9/**'
+    - 'projects/**'
+    - 'winbuild/**'
+  pull_request:
+    branches:
+    - master
+    paths-ignore:
+    - '**/*.md'
+    - '**/CMakeLists.txt'
+    - '.azure-pipelines.yml'
+    - '.circleci/**'
+    - '.cirrus.yml'
+    - 'appveyor.yml'
+    - 'CMake/**'
+    - 'packages/**'
+    - 'plan9/**'
+    - 'projects/**'
+    - 'winbuild/**'
+
+concurrency:
+  # Hardcoded workflow filename as workflow name above is just Linux again
+  group: ngtcp2-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+permissions: {}
+
+env:
+  MAKEFLAGS: -j 3
+  openssl-version: 3.0.9+quic
+  nghttp3-version: v0.13.0
+  ngtcp2-version: v0.17.0
+  nghttp2-version: v1.55.1
+  gnutls-version: 3.8.0
+  wolfssl-version: v5.6.3-stable
+  mod_h2-version: v2.0.21
+
+jobs:
+  autotools:
+    name: ${{ matrix.build.name }}
+    runs-on: 'ubuntu-latest'
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        build:
+        - name: quictls
+          configure: >-
+            PKG_CONFIG_PATH="$HOME/nghttpx/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/nghttpx/lib"
+            --with-ngtcp2=$HOME/nghttpx --enable-warnings --enable-werror --enable-debug
+            --with-test-nghttpx="$HOME/nghttpx/bin/nghttpx"
+            --with-openssl=$HOME/nghttpx
+        - name: gnutls
+          configure: >-
+            PKG_CONFIG_PATH="$HOME/nghttpx/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/nghttpx/lib"
+            --with-ngtcp2=$HOME/nghttpx --enable-warnings --enable-werror --enable-debug
+            --with-test-nghttpx="$HOME/nghttpx/bin/nghttpx"
+            --with-gnutls=$HOME/nghttpx
+        - name: wolfssl
+          configure: >-
+            PKG_CONFIG_PATH="$HOME/nghttpx/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/nghttpx/lib"
+            --with-ngtcp2=$HOME/nghttpx --enable-warnings --enable-werror --enable-debug
+            --with-test-nghttpx="$HOME/nghttpx/bin/nghttpx"
+            --with-wolfssl=$HOME/nghttpx
+
+    steps:
+    - run: |
+        sudo apt-get update
+        sudo apt-get install libtool autoconf automake pkg-config stunnel4 \
+          libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev \
+          nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin \
+          libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools \
+          texinfo texlive texlive-extra-utils autopoint libev-dev \
+          apache2 apache2-dev libnghttp2-dev
+      name: 'install prereqs and impacket, pytest, crypto, apache2'
+
+    - name: cache nghttpx
+      uses: actions/cache@v3
+      id: cache-nghttpx
+      env:
+        cache-name: cache-nghttpx
+      with:
+        path: /home/runner/nghttpx
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-openssl-${{ env.openssl-version }}-nghttp3-${{ env.nghttp3-version }}-ngtcp2-${{ env.ngtcp2-version }}-nghttp2-${{ env.nghttp2-version }}-gnutls-${{ env.gnutls-version }}-wolfssl-${{ env.wolfssl-version }}
+
+    - if: steps.cache-nghttpx.outputs.cache-hit != 'true'
+      run: |
+        git clone --quiet --depth=1 -b openssl-${{ env.openssl-version }} https://github.com/quictls/openssl
+        cd openssl
+        ./config --prefix=$HOME/nghttpx --libdir=$HOME/nghttpx/lib
+        make -j1 install_sw
+      name: 'install quictls'
+
+    - if: steps.cache-nghttpx.outputs.cache-hit != 'true'
+      run: |
+        git clone --quiet --depth=1 -b ${{ env.gnutls-version }} https://github.com/gnutls/gnutls.git
+        cd gnutls
+        ./bootstrap
+        ./configure  --prefix=$HOME/nghttpx \
+          PKG_CONFIG_PATH="$HOME/nghttpx/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/nghttpx/lib -L$HOME/nghttpx/lib" \
+          --with-included-libtasn1 --with-included-unistring \
+          --disable-guile --disable-doc --disable-tests --disable-tools
+        make install
+      name: 'install gnutls'
+
+    - if: steps.cache-nghttpx.outputs.cache-hit != 'true'
+      run: |
+        git clone --quiet --depth=1 -b ${{ env.wolfssl-version }} https://github.com/wolfSSL/wolfssl.git
+        cd wolfssl
+        ./autogen.sh
+        ./configure --enable-all --enable-quic --prefix=$HOME/nghttpx
+        make install
+      name: 'install wolfssl'
+
+    - if: steps.cache-nghttpx.outputs.cache-hit != 'true'
+      run: |
+        git clone --quiet --depth=1 -b ${{ env.nghttp3-version }} https://github.com/ngtcp2/nghttp3
+        cd nghttp3
+        autoreconf -fi
+        ./configure --prefix=$HOME/nghttpx PKG_CONFIG_PATH="$HOME/nghttpx/lib/pkgconfig" --enable-lib-only
+        make install
+      name: 'install nghttp3'
+
+    - if: steps.cache-nghttpx.outputs.cache-hit != 'true'
+      run: |
+        git clone --quiet --depth=1 -b ${{ env.ngtcp2-version }} https://github.com/ngtcp2/ngtcp2
+        cd ngtcp2
+        autoreconf -fi
+        ./configure --prefix=$HOME/nghttpx PKG_CONFIG_PATH="$HOME/nghttpx/lib/pkgconfig" --enable-lib-only --with-openssl --with-gnutls --with-wolfssl
+        make install
+      name: 'install ngtcp2'
+
+    - if: steps.cache-nghttpx.outputs.cache-hit != 'true'
+      run: |
+        git clone --quiet --depth=1 -b ${{ env.nghttp2-version }} https://github.com/nghttp2/nghttp2
+        cd nghttp2
+        autoreconf -fi
+        ./configure --prefix=$HOME/nghttpx PKG_CONFIG_PATH="$HOME/nghttpx/lib/pkgconfig" --enable-http3
+        make install
+      name: 'install nghttp2'
+
+    - run: |
+        git clone --quiet --depth=1 -b master https://github.com/icing/mod_h2
+        cd mod_h2
+        autoreconf -fi
+        ./configure
+        make
+        sudo make install
+      name: 'install mod_h2'
+
+    - uses: actions/checkout@v3
+
+    - run: |
+        sudo python3 -m pip install -r tests/requirements.txt -r tests/http/requirements.txt
+      name: 'install python test prereqs'
+
+    - run: autoreconf -fi
+      name: 'autoreconf'
+
+    - run: ./configure ${{ matrix.build.configure }}
+      name: 'configure'
+
+    - run: make V=1
+      name: 'make'
+
+    - run: make V=1 examples
+      name: 'make examples'
+
+    - run: make V=1 -C tests
+      name: 'make tests'
+
+    - run: make V=1 test-ci
+      name: 'run tests'
+      env:
+        TFLAGS: "${{ matrix.build.tflags }}"
+
+    - run: pytest -v
+      name: 'run pytest'
+      env:
+        TFLAGS: "${{ matrix.build.tflags }}"
diff --git a/.github/workflows/ngtcp2-quictls.yml b/.github/workflows/ngtcp2-quictls.yml
deleted file mode 100644 (file)
index 5423b17..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-name: ngtcp2 quictls
-
-on:
-  push:
-    branches:
-    - master
-    - '*/ci'
-    paths-ignore:
-    - '**/*.md'
-    - '**/CMakeLists.txt'
-    - '.azure-pipelines.yml'
-    - '.circleci/**'
-    - '.cirrus.yml'
-    - 'appveyor.yml'
-    - 'CMake/**'
-    - 'packages/**'
-    - 'plan9/**'
-    - 'projects/**'
-    - 'winbuild/**'
-  pull_request:
-    branches:
-    - master
-    paths-ignore:
-    - '**/*.md'
-    - '**/CMakeLists.txt'
-    - '.azure-pipelines.yml'
-    - '.circleci/**'
-    - '.cirrus.yml'
-    - 'appveyor.yml'
-    - 'CMake/**'
-    - 'packages/**'
-    - 'plan9/**'
-    - 'projects/**'
-    - 'winbuild/**'
-
-concurrency:
-  # Hardcoded workflow filename as workflow name above is just Linux again
-  group: ngtcp2-openssl-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-permissions: {}
-
-env:
-  MAKEFLAGS: -j 3
-
-jobs:
-  autotools:
-    name: ${{ matrix.build.name }}
-    runs-on: 'ubuntu-latest'
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        build:
-        - name: quictls
-          install: >-
-            libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev
-          configure: >-
-            PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib"
-            --with-ngtcp2=$HOME/all --enable-warnings --enable-werror --enable-debug
-            --with-test-nghttpx="$HOME/all/bin/nghttpx"
-          ngtcp2-configure: >-
-            --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
-
-    steps:
-    - run: |
-        sudo apt-get update
-        sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }}
-        sudo apt-get install apache2 apache2-dev
-      name: 'install prereqs and impacket, pytest, crypto'
-
-    - run: |
-        git clone --quiet --depth=1 -b openssl-3.0.9+quic https://github.com/quictls/openssl
-        cd openssl
-        ./config --prefix=$HOME/all --libdir=$HOME/all/lib
-        make -j1 install_sw
-      name: 'install quictls'
-
-    - run: |
-        git clone --quiet --depth=1 -b v0.13.0 https://github.com/ngtcp2/nghttp3
-        cd nghttp3
-        autoreconf -fi
-        ./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
-        make install
-      name: 'install nghttp3'
-
-    - run: |
-        git clone --quiet --depth=1 -b v0.17.0 https://github.com/ngtcp2/ngtcp2
-        cd ngtcp2
-        autoreconf -fi
-        ./configure ${{ matrix.build.ngtcp2-configure }} --with-openssl
-        make install
-      name: 'install ngtcp2'
-
-    - run: |
-        git clone --quiet --depth=1 -b v1.55.1 https://github.com/nghttp2/nghttp2
-        cd nghttp2
-        autoreconf -fi
-        ./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-http3
-        make install
-      name: 'install nghttp2'
-
-    - run: |
-        git clone --quiet --depth=1 -b master https://github.com/icing/mod_h2
-        cd mod_h2
-        autoreconf -fi
-        ./configure PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig"
-        make
-        sudo make install
-      name: 'install mod_h2'
-
-    - uses: actions/checkout@v3
-
-    - run: |
-        sudo python3 -m pip install -r tests/requirements.txt -r tests/http/requirements.txt
-      name: 'install python test prereqs'
-
-    - run: autoreconf -fi
-      name: 'autoreconf'
-
-    - run: ./configure --with-openssl=$HOME/all ${{ matrix.build.configure }}
-      name: 'configure'
-
-    - run: make V=1
-      name: 'make'
-
-    - run: make V=1 examples
-      name: 'make examples'
-
-    - run: make V=1 -C tests
-      name: 'make tests'
-
-    - run: make V=1 test-ci
-      name: 'run tests'
-      env:
-        TFLAGS: "${{ matrix.build.tflags }}"
-
-    - run: pytest -v
-      name: 'run pytest'
-      env:
-        TFLAGS: "${{ matrix.build.tflags }}"
diff --git a/.github/workflows/ngtcp2-wolfssl.yml b/.github/workflows/ngtcp2-wolfssl.yml
deleted file mode 100644 (file)
index 6c8b983..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
-#
-# SPDX-License-Identifier: curl
-
-name: ngtcp2 wolfSSL
-
-on:
-  push:
-    branches:
-    - master
-    - '*/ci'
-    paths-ignore:
-    - '**/*.md'
-    - '**/CMakeLists.txt'
-    - '.azure-pipelines.yml'
-    - '.circleci/**'
-    - '.cirrus.yml'
-    - 'appveyor.yml'
-    - 'CMake/**'
-    - 'packages/**'
-    - 'plan9/**'
-    - 'projects/**'
-    - 'winbuild/**'
-  pull_request:
-    branches:
-    - master
-    paths-ignore:
-    - '**/*.md'
-    - '**/CMakeLists.txt'
-    - '.azure-pipelines.yml'
-    - '.circleci/**'
-    - '.cirrus.yml'
-    - 'appveyor.yml'
-    - 'CMake/**'
-    - 'packages/**'
-    - 'plan9/**'
-    - 'projects/**'
-    - 'winbuild/**'
-
-concurrency:
-  # Hardcoded workflow filename as workflow name above is just Linux again
-  group: ngtcp2-wolfssl-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-permissions: {}
-
-env:
-  MAKEFLAGS: -j 3
-
-jobs:
-  autotools:
-    name: ${{ matrix.build.name }}
-    runs-on: 'ubuntu-latest'
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        build:
-        - name: wolfssl
-          install: >-
-            libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev
-          configure: >-
-            PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" LDFLAGS="-Wl,-rpath,$HOME/all/lib"
-            --with-ngtcp2=$HOME/all --enable-warnings --enable-werror --enable-debug
-            --with-test-nghttpx="$HOME/all/bin/nghttpx"
-          ngtcp2-configure: >-
-            --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
-          wolfssl-configure: >-
-            --enable-all --enable-quic
-
-    steps:
-    - run: |
-        sudo apt-get update
-        sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }}
-        sudo apt-get install apache2 apache2-dev
-      name: 'install prereqs'
-
-    - run: |
-        WOLFSSL_VER=v5.6.3-stable
-        git clone --quiet --depth=1 -b $WOLFSSL_VER https://github.com/wolfSSL/wolfssl.git
-        cd wolfssl
-        ./autogen.sh
-        ./configure ${{ matrix.build.wolfssl-configure }} --prefix=$HOME/all
-        make install
-      name: 'install wolfssl'
-
-    - run: |
-        git clone --quiet --depth=1 -b openssl-3.0.9+quic https://github.com/quictls/openssl
-        cd openssl
-        ./config --prefix=$HOME/all --libdir=$HOME/all/lib
-        make -j1 install_sw
-      name: 'install quictls'
-
-    - run: |
-        git clone --quiet --depth=1 -b v0.13.0 https://github.com/ngtcp2/nghttp3
-        cd nghttp3
-        autoreconf -fi
-        ./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-lib-only
-        make install
-      name: 'install nghttp3'
-
-    - run: |
-        git clone --quiet --depth=1 -b v0.17.0 https://github.com/ngtcp2/ngtcp2
-        cd ngtcp2
-        autoreconf -fi
-        ./configure ${{ matrix.build.ngtcp2-configure }} --with-openssl  --with-wolfssl
-        make install
-      name: 'install ngtcp2'
-
-    - run: |
-        git clone --quiet --depth=1 -b v1.55.1 https://github.com/nghttp2/nghttp2
-        cd nghttp2
-        autoreconf -fi
-        ./configure --prefix=$HOME/all PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig" --enable-http3
-        make install
-      name: 'install nghttp2'
-
-    - run: |
-        git clone --quiet --depth=1 -b master https://github.com/icing/mod_h2
-        cd mod_h2
-        autoreconf -fi
-        ./configure PKG_CONFIG_PATH="$HOME/all/lib/pkgconfig"
-        make
-        sudo make install
-      name: 'install mod_h2'
-
-    - uses: actions/checkout@v3
-
-    - run: |
-        sudo python3 -m pip install -r tests/requirements.txt -r tests/http/requirements.txt
-      name: 'install python test prereqs'
-
-    - run: autoreconf -fi
-      name: 'autoreconf'
-
-    - run: ./configure --with-wolfssl=$HOME/all ${{ matrix.build.configure }}
-      name: 'configure'
-
-    - run: make V=1
-      name: 'make'
-
-    - run: make V=1 examples
-      name: 'make examples'
-
-    - run: make V=1 -C tests
-      name: 'make tests'
-
-    - run: make V=1 test-ci
-      name: 'run tests'
-      env:
-        TFLAGS: "${{ matrix.build.tflags }}"
-
-    # Disabled for now, we see spurious SSL_connect() errors when talking
-    # http/1.1 to apache and this, so far, is not reproducable in local testing
-    #- run: pytest -v
-    #  name: 'run pytest'
-    #  env:
-    #    TFLAGS: "${{ matrix.build.tflags }}"
index 684c406fc069ff860e053fc118fec78fabd0c9f8..336b571c4e9cd03a2b97f24028cdb26d64e33f73 100644 (file)
@@ -87,12 +87,12 @@ class TestDownload:
         r.check_response(http_status=200, count=100, connect_count=1)
 
     # download 100 files parallel
-    @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+    @pytest.mark.parametrize("proto", ['h2', 'h3'])
     def test_02_04_download_100_parallel(self, env: Env,
                                          httpd, nghttpx, repeat, proto):
         if proto == 'h3' and not env.have_h3():
             pytest.skip("h3 not supported")
-        max_parallel = 6 if proto == 'http/1.1' else 50
+        max_parallel = 50
         curl = CurlClient(env=env)
         urln = f'https://{env.authority_for(env.domain1, proto)}/data.json?[0-99]'
         r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[
@@ -163,7 +163,7 @@ class TestDownload:
     @pytest.mark.parametrize("proto", ['http/1.1'])
     def test_02_07b_download_reuse(self, env: Env,
                                    httpd, nghttpx, repeat, proto):
-        count = 20
+        count = 6
         curl = CurlClient(env=env)
         urln = f'https://{env.authority_for(env.domain1, proto)}/data.json?[0-{count-1}]'
         r = curl.http_download(urls=[urln], alpn_proto=proto,
@@ -185,7 +185,7 @@ class TestDownload:
         r = curl.http_download(urls=[urln], alpn_proto=proto)
         r.check_response(count=count, http_status=200)
 
-    @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+    @pytest.mark.parametrize("proto", ['h2', 'h3'])
     def test_02_09_1MB_parallel(self, env: Env,
                               httpd, nghttpx, repeat, proto):
         if proto == 'h3' and not env.have_h3():
@@ -209,7 +209,7 @@ class TestDownload:
         r = curl.http_download(urls=[urln], alpn_proto=proto)
         r.check_response(count=count, http_status=200)
 
-    @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+    @pytest.mark.parametrize("proto", ['h2', 'h3'])
     def test_02_11_10MB_parallel(self, env: Env,
                               httpd, nghttpx, repeat, proto):
         if proto == 'h3' and not env.have_h3():