Merge pull request #2 from nginxinc/fix_build

fix: building with nginx with HTTP/3
This commit is contained in:
Evgeny 2023-06-08 12:07:23 -07:00 committed by GitHub
commit 332a4bfac2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions

18
.github/workflows/nginx-otel-build.yml vendored Normal file
View file

@ -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

View file

@ -117,10 +117,13 @@ target_include_directories(ngx_otel_module PRIVATE
${NGX_OTEL_NGINX_BUILD_DIR} ${NGX_OTEL_NGINX_BUILD_DIR}
${NGX_OTEL_NGINX_DIR}/src/core ${NGX_OTEL_NGINX_DIR}/src/core
${NGX_OTEL_NGINX_DIR}/src/event ${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/os/unix
${NGX_OTEL_NGINX_DIR}/src/http ${NGX_OTEL_NGINX_DIR}/src/http
${NGX_OTEL_NGINX_DIR}/src/http/modules ${NGX_OTEL_NGINX_DIR}/src/http/modules
${NGX_OTEL_NGINX_DIR}/src/http/v2 ${NGX_OTEL_NGINX_DIR}/src/http/v2
${NGX_OTEL_NGINX_DIR}/src/http/v3
${PROTO_OUT_DIR}) ${PROTO_OUT_DIR})
target_link_libraries(ngx_otel_module target_link_libraries(ngx_otel_module