From 48ccc85726d6b490d973fdb57c1d75fe90b91bf3 Mon Sep 17 00:00:00 2001 From: Eugene Grebenschikov Date: Wed, 7 Jun 2023 16:45:35 -0700 Subject: [PATCH] fix: build with nginx with HTTP/3 --- .github/workflows/nginx-otel-build.yml | 18 ++++++++++++++++++ CMakeLists.txt | 3 +++ 2 files changed, 21 insertions(+) create mode 100644 .github/workflows/nginx-otel-build.yml diff --git a/.github/workflows/nginx-otel-build.yml b/.github/workflows/nginx-otel-build.yml new file mode 100644 index 0000000..c34ee66 --- /dev/null +++ b/.github/workflows/nginx-otel-build.yml @@ -0,0 +1,18 @@ +name: nginx-otel-build +run-name: ${{ github.actor }} is triggering pipeline +on: [push] +jobs: + build-and-test-module: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - run: | + sudo apt-get update && sudo apt install -y mercurial cmake \ + libc-ares-dev libre2-dev libssl-dev zlib1g-dev curl + - run: | + hg clone http://hg.nginx.org/nginx/ && cd nginx && \ + auto/configure --with-compat --with-debug --with-http_ssl_module \ + --with-http_v2_module --with-http_v3_module && make -j 4 + - run: | + mkdir build && cd build && cmake -DNGX_OTEL_NGINX_BUILD_DIR=\ + ${PWD}/../nginx/objs .. && make -j 4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f204d7..96ac4cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,10 +117,13 @@ target_include_directories(ngx_otel_module PRIVATE ${NGX_OTEL_NGINX_BUILD_DIR} ${NGX_OTEL_NGINX_DIR}/src/core ${NGX_OTEL_NGINX_DIR}/src/event + ${NGX_OTEL_NGINX_DIR}/src/event/modules + ${NGX_OTEL_NGINX_DIR}/src/event/quic ${NGX_OTEL_NGINX_DIR}/src/os/unix ${NGX_OTEL_NGINX_DIR}/src/http ${NGX_OTEL_NGINX_DIR}/src/http/modules ${NGX_OTEL_NGINX_DIR}/src/http/v2 + ${NGX_OTEL_NGINX_DIR}/src/http/v3 ${PROTO_OUT_DIR}) target_link_libraries(ngx_otel_module