From 4f262ee0e1281558dc366f2c0919217081182aeb Mon Sep 17 00:00:00 2001 From: Max Dymond Date: Mon, 13 May 2024 16:15:18 +0100 Subject: [PATCH] Add the remainder of the workflows --- .github/workflows/linux.yml | 1 + .github/workflows/ngtcp2-linux.yml | 23 ++++++++++++++--------- .github/workflows/osslq-linux.yml | 22 ++++++++++++++-------- .github/workflows/quiche-linux.yml | 22 ++++++++++++++-------- .github/workflows/wolfssl.yml | 6 +++--- 5 files changed, 46 insertions(+), 28 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 39f9352fcb..0b6190c849 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -41,6 +41,7 @@ permissions: {} env: MAKEFLAGS: -j 3 + # unhandled bearssl-version: 0.6 # renovate: datasource=github-tags depName=libressl-portable/portable versioning=semver registryUrl=https://github.com libressl-version: 3.7.3 diff --git a/.github/workflows/ngtcp2-linux.yml b/.github/workflows/ngtcp2-linux.yml index 092126a080..9eef4aa5bb 100644 --- a/.github/workflows/ngtcp2-linux.yml +++ b/.github/workflows/ngtcp2-linux.yml @@ -46,13 +46,19 @@ permissions: {} env: MAKEFLAGS: -j 3 + # unhandled quictls-version: 3.1.4+quic + # renovate: datasource=github-tags depName=gnutls/gnutls versioning=semver registryUrl=https://github.com gnutls-version: 3.8.3 wolfssl-version: master - nghttp3-version: v1.2.0 - ngtcp2-version: v1.4.0 - nghttp2-version: v1.61.0 - mod_h2-version: v2.0.27 + # renovate: datasource=github-tags depName=ngtcp2/nghttp3 versioning=semver registryUrl=https://github.com + nghttp3-version: 1.2.0 + # renovate: datasource=github-tags depName=ngtcp2/ngtcp2 versioning=semver registryUrl=https://github.com + ngtcp2-version: 1.4.0 + # renovate: datasource=github-tags depName=nghttp2/nghttp2 versioning=semver registryUrl=https://github.com + nghttp2-version: 1.61.0 + # renovate: datasource=github-tags depName=icing/mod_h2 versioning=semver registryUrl=https://github.com + mod_h2-version: 2.0.27 jobs: autotools: @@ -145,7 +151,6 @@ jobs: make install name: 'install gnutls' - - name: cache wolfssl uses: actions/cache@v4 id: cache-wolfssl @@ -184,7 +189,7 @@ jobs: - if: steps.cache-nghttp3.outputs.cache-hit != 'true' run: | cd $HOME - git clone --quiet --depth=1 -b ${{ env.nghttp3-version }} https://github.com/ngtcp2/nghttp3 + git clone --quiet --depth=1 -b v${{ env.nghttp3-version }} https://github.com/ngtcp2/nghttp3 cd nghttp3 git submodule update --init autoreconf -fi @@ -199,7 +204,7 @@ jobs: # depends on all other cached libs built so far - run: | - git clone --quiet --depth=1 -b ${{ env.ngtcp2-version }} https://github.com/ngtcp2/ngtcp2 + git clone --quiet --depth=1 -b v${{ 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 @@ -208,7 +213,7 @@ jobs: # depends on all other cached libs built so far - run: | - git clone --quiet --depth=1 -b ${{ env.nghttp2-version }} https://github.com/nghttp2/nghttp2 + git clone --quiet --depth=1 -b v${{ 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 @@ -227,7 +232,7 @@ jobs: - if: steps.cache-mod_h2.outputs.cache-hit != 'true' run: | cd $HOME - git clone --quiet --depth=1 -b ${{ env.mod_h2-version }} https://github.com/icing/mod_h2 + git clone --quiet --depth=1 -b v${{ env.mod_h2-version }} https://github.com/icing/mod_h2 cd mod_h2 autoreconf -fi ./configure diff --git a/.github/workflows/osslq-linux.yml b/.github/workflows/osslq-linux.yml index 42c5ea12f9..a13a6c9d09 100644 --- a/.github/workflows/osslq-linux.yml +++ b/.github/workflows/osslq-linux.yml @@ -46,12 +46,18 @@ permissions: {} env: MAKEFLAGS: -j 3 + # handled in renovate.json openssl3-version: openssl-3.3.0 + # unhandled quictls-version: 3.1.4+quic - nghttp3-version: v1.2.0 - ngtcp2-version: v1.4.0 - nghttp2-version: v1.61.0 - mod_h2-version: v2.0.27 + # renovate: datasource=github-tags depName=ngtcp2/nghttp3 versioning=semver registryUrl=https://github.com + nghttp3-version: 1.2.0 + # renovate: datasource=github-tags depName=ngtcp2/ngtcp2 versioning=semver registryUrl=https://github.com + ngtcp2-version: 1.4.0 + # renovate: datasource=github-tags depName=nghttp2/nghttp2 versioning=semver registryUrl=https://github.com + nghttp2-version: 1.61.0 + # renovate: datasource=github-tags depName=icing/mod_h2 versioning=semver registryUrl=https://github.com + mod_h2-version: 2.0.27 jobs: autotools: @@ -147,7 +153,7 @@ jobs: - if: steps.cache-nghttp3.outputs.cache-hit != 'true' run: | cd $HOME - git clone --quiet --depth=1 -b ${{ env.nghttp3-version }} https://github.com/ngtcp2/nghttp3 + git clone --quiet --depth=1 -b v${{ env.nghttp3-version }} https://github.com/ngtcp2/nghttp3 cd nghttp3 git submodule update --init autoreconf -fi @@ -162,7 +168,7 @@ jobs: # depends on all other cached libs built so far - run: | - git clone --quiet --depth=1 -b ${{ env.ngtcp2-version }} https://github.com/ngtcp2/ngtcp2 + git clone --quiet --depth=1 -b v${{ 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 @@ -171,7 +177,7 @@ jobs: # depends on all other cached libs built so far - run: | - git clone --quiet --depth=1 -b ${{ env.nghttp2-version }} https://github.com/nghttp2/nghttp2 + git clone --quiet --depth=1 -b v${{ 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 @@ -190,7 +196,7 @@ jobs: - if: steps.cache-mod_h2.outputs.cache-hit != 'true' run: | cd $HOME - git clone --quiet --depth=1 -b ${{ env.mod_h2-version }} https://github.com/icing/mod_h2 + git clone --quiet --depth=1 -b v${{ env.mod_h2-version }} https://github.com/icing/mod_h2 cd mod_h2 autoreconf -fi ./configure diff --git a/.github/workflows/quiche-linux.yml b/.github/workflows/quiche-linux.yml index 1295b3be5a..8ae10fec46 100644 --- a/.github/workflows/quiche-linux.yml +++ b/.github/workflows/quiche-linux.yml @@ -46,12 +46,18 @@ permissions: {} env: MAKEFLAGS: -j 3 + # unhandled openssl-version: 3.1.4+quic - nghttp3-version: v1.2.0 - ngtcp2-version: v1.4.0 - nghttp2-version: v1.61.0 + # renovate: datasource=github-tags depName=ngtcp2/nghttp3 versioning=semver registryUrl=https://github.com + nghttp3-version: 1.2.0 + # renovate: datasource=github-tags depName=ngtcp2/ngtcp2 versioning=semver registryUrl=https://github.com + ngtcp2-version: 1.4.0 + # renovate: datasource=github-tags depName=nghttp2/nghttp2 versioning=semver registryUrl=https://github.com + nghttp2-version: 1.61.0 + # renovate: datasource=github-tags depName=cloudflare/quiche versioning=semver registryUrl=https://github.com quiche-version: 0.20.0 - mod_h2-version: v2.0.27 + # renovate: datasource=github-tags depName=icing/mod_h2 versioning=semver registryUrl=https://github.com + mod_h2-version: 2.0.27 jobs: autotools: @@ -101,7 +107,7 @@ jobs: - if: steps.cache-nghttpx.outputs.cache-hit != 'true' run: | - git clone --quiet --depth=1 -b ${{ env.nghttp3-version }} https://github.com/ngtcp2/nghttp3 + git clone --quiet --depth=1 -b v${{ env.nghttp3-version }} https://github.com/ngtcp2/nghttp3 cd nghttp3 git submodule update --init autoreconf -fi @@ -111,7 +117,7 @@ jobs: - if: steps.cache-nghttpx.outputs.cache-hit != 'true' run: | - git clone --quiet --depth=1 -b ${{ env.ngtcp2-version }} https://github.com/ngtcp2/ngtcp2 + git clone --quiet --depth=1 -b v${{ 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 @@ -120,7 +126,7 @@ jobs: - if: steps.cache-nghttpx.outputs.cache-hit != 'true' run: | - git clone --quiet --depth=1 -b ${{ env.nghttp2-version }} https://github.com/nghttp2/nghttp2 + git clone --quiet --depth=1 -b v${{ 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 @@ -167,7 +173,7 @@ jobs: - if: steps.cache-mod_h2.outputs.cache-hit != 'true' run: | cd $HOME - git clone --quiet --depth=1 -b ${{ env.mod_h2-version }} https://github.com/icing/mod_h2 + git clone --quiet --depth=1 -b v${{ env.mod_h2-version }} https://github.com/icing/mod_h2 cd mod_h2 autoreconf -fi ./configure diff --git a/.github/workflows/wolfssl.yml b/.github/workflows/wolfssl.yml index 36be1d51cb..0a483dbbe0 100644 --- a/.github/workflows/wolfssl.yml +++ b/.github/workflows/wolfssl.yml @@ -73,8 +73,10 @@ jobs: sudo python3 -m pip install impacket name: 'install prereqs and impacket' + - uses: actions/checkout@v4 + - run: | - WOLFSSL_VER=5.6.3 + source .github/scripts/VERSIONS curl -LOsSf --retry 6 --retry-connrefused --max-time 999 https://github.com/wolfSSL/wolfssl/archive/v$WOLFSSL_VER-stable.tar.gz tar -xzf v$WOLFSSL_VER-stable.tar.gz cd wolfssl-$WOLFSSL_VER-stable @@ -83,8 +85,6 @@ jobs: make install name: 'install wolfssl' - - uses: actions/checkout@v4 - - run: autoreconf -fi name: 'autoreconf'