diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 71fe694b..11d97dfb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,11 +7,11 @@ permissions: read-all env: LIBBPF_VERSION: v1.3.0 OPENSSL1_VERSION: 1_1_1w+quic - OPENSSL3_VERSION: 3.1.4+quic - BORINGSSL_VERSION: f42be90d665b6a376177648ccbb76fbbd6497c13 - AWSLC_VERSION: v1.20.0 - NGHTTP3_VERSION: v1.1.0 - NGTCP2_VERSION: v1.2.0 + OPENSSL3_VERSION: 3.1.5+quic + BORINGSSL_VERSION: 8e6a26d128484b886e6dcbfa558b993d38950bb5 + AWSLC_VERSION: v1.21.0 + NGHTTP3_VERSION: v1.2.0 + NGTCP2_VERSION: v1.3.0 jobs: build-cache: @@ -159,6 +159,7 @@ jobs: run: | git clone --depth 1 -b ${{ env.NGHTTP3_VERSION}} https://github.com/ngtcp2/nghttp3 cd nghttp3 + git submodule update --init --depth 1 autoreconf -i ./configure --prefix=$PWD/build --enable-lib-only make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" check @@ -168,6 +169,7 @@ jobs: run: | git clone --depth 1 -b ${{ env.NGTCP2_VERSION }} https://github.com/ngtcp2/ngtcp2 ngtcp2-openssl1 cd ngtcp2-openssl1 + git submodule update --init --depth 1 autoreconf -i ./configure --prefix=$PWD/build --enable-lib-only \ PKG_CONFIG_PATH="../openssl1/build/lib/pkgconfig" \ @@ -181,6 +183,7 @@ jobs: run: | git clone --depth 1 -b ${{ env.NGTCP2_VERSION }} https://github.com/ngtcp2/ngtcp2 ngtcp2-openssl3 cd ngtcp2-openssl3 + git submodule update --init --depth 1 autoreconf -i ./configure --prefix=$PWD/build --enable-lib-only \ PKG_CONFIG_PATH="../openssl3/build/lib/pkgconfig" \ diff --git a/README.rst b/README.rst index dfc700d1..69dc1ae5 100644 --- a/README.rst +++ b/README.rst @@ -127,7 +127,7 @@ following libraries are required: `_; or LibreSSL (does not support 0RTT); or aws-lc; or `BoringSSL `_ (commit - f42be90d665b6a376177648ccbb76fbbd6497c13) + 8e6a26d128484b886e6dcbfa558b993d38950bb5) * `ngtcp2 `_ >= 1.0.0 * `nghttp3 `_ >= 1.1.0 @@ -341,7 +341,7 @@ Build aws-lc: .. code-block:: text - $ git clone --depth 1 -b v1.20.0 https://github.com/aws/aws-lc + $ git clone --depth 1 -b v1.21.0 https://github.com/aws/aws-lc $ cd aws-lc $ cmake -B build -DDISABLE_GO=ON --install-prefix=$PWD/opt $ make -j$(nproc) -C build @@ -352,8 +352,9 @@ Build nghttp3: .. code-block:: text - $ git clone --depth 1 -b v1.1.0 https://github.com/ngtcp2/nghttp3 + $ git clone --depth 1 -b v1.2.0 https://github.com/ngtcp2/nghttp3 $ cd nghttp3 + $ git submodule update --init --depth 1 $ autoreconf -i $ ./configure --prefix=$PWD/build --enable-lib-only $ make -j$(nproc) @@ -364,8 +365,9 @@ Build ngtcp2: .. code-block:: text - $ git clone --depth 1 -b v1.2.0 https://github.com/ngtcp2/ngtcp2 + $ git clone --depth 1 -b v1.3.0 https://github.com/ngtcp2/ngtcp2 $ cd ngtcp2 + $ git submodule update --init --depth 1 $ autoreconf -i $ ./configure --prefix=$PWD/build --enable-lib-only --with-boringssl \ BORINGSSL_CFLAGS="-I$PWD/../aws-lc/opt/include" \ diff --git a/docker/Dockerfile b/docker/Dockerfile index bbe5133e..84260241 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && \ zlib1g-dev libev-dev libjemalloc-dev ruby-dev libc-ares-dev bison \ libelf-dev libbrotli-dev -RUN git clone --depth 1 -b v1.20.0 https://github.com/aws/aws-lc && \ +RUN git clone --depth 1 -b v1.21.0 https://github.com/aws/aws-lc && \ cd aws-lc && \ cmake -B build -DDISABLE_GO=ON && \ make -j$(nproc) -C build && \ @@ -17,8 +17,9 @@ RUN git clone --depth 1 -b v1.20.0 https://github.com/aws/aws-lc && \ cd .. && \ rm -rf aws-lc -RUN git clone --depth 1 -b v1.1.0 https://github.com/ngtcp2/nghttp3 && \ +RUN git clone --depth 1 -b v1.2.0 https://github.com/ngtcp2/nghttp3 && \ cd nghttp3 && \ + git submodule update --init --depth 1 && \ autoreconf -i && \ ./configure --enable-lib-only && \ make -j$(nproc) && \ @@ -26,8 +27,9 @@ RUN git clone --depth 1 -b v1.1.0 https://github.com/ngtcp2/nghttp3 && \ cd .. && \ rm -rf nghttp3 -RUN git clone --depth 1 -b v1.2.0 https://github.com/ngtcp2/ngtcp2 && \ +RUN git clone --depth 1 -b v1.3.0 https://github.com/ngtcp2/ngtcp2 && \ cd ngtcp2 && \ + git submodule update --init --depth 1 && \ autoreconf -i && \ ./configure --enable-lib-only --with-boringssl \ LIBTOOL_LDFLAGS="-static-libtool-libs" \