daroche/nginx-otel-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enforce compiler warnings in CI build only.

Browse source 
(cherry picked from commit 5a0071f497)
This commit is contained in:
Dmitry Plotnikov 2024-03-01 06:53:55 +00:00 • committed by Sergey A. Osokin
parent 91e6d13133
commit cbf01a63a8
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/nginx-otel-module-check.yml vendored
View file

@ -24,7 +24,8 @@ jobs:
- name: Build module - name: Build module
working-directory: build working-directory: build
run: | run: |
cmake -DNGX_OTEL_NGINX_BUILD_DIR=${PWD}/../nginx/objs .. cmake -DNGX_OTEL_NGINX_BUILD_DIR=${PWD}/../nginx/objs \
-DNGX_OTEL_DEV=ON ..
make -j 4 make -j 4
strip ngx_otel_module.so strip ngx_otel_module.so
- name: Archive module - name: Archive module
@ -75,11 +76,11 @@ jobs:
working-directory: nginx working-directory: nginx
run: | run: |
auto/configure --with-compat --with-debug --with-http_ssl_module \ auto/configure --with-compat --with-debug --with-http_ssl_module \
--with-http_v2_module --with-http_v3_module --with-http_v2_module --with-http_v3_module
make -j 4 make -j 4
- name: Run tests - name: Run tests
working-directory: tests working-directory: tests
run: | run: |
PERL5LIB=../nginx-tests/lib TEST_NGINX_UNSAFE=1 \ PERL5LIB=../nginx-tests/lib TEST_NGINX_UNSAFE=1 \
TEST_NGINX_VERBOSE=1 TEST_NGINX_GLOBALS="load_module \ TEST_NGINX_VERBOSE=1 TEST_NGINX_GLOBALS="load_module \
${PWD}/../build/ngx_otel_module.so;" prove -v . ${PWD}/../build/ngx_otel_module.so;" prove -v .

9
CMakeLists.txt
View file

@ -6,8 +6,9 @@ set(NGX_OTEL_NGINX_BUILD_DIR ""
set(NGX_OTEL_NGINX_DIR "${NGX_OTEL_NGINX_BUILD_DIR}/.." set(NGX_OTEL_NGINX_DIR "${NGX_OTEL_NGINX_BUILD_DIR}/.."
CACHE PATH "Nginx source dir") CACHE PATH "Nginx source dir")
set(NGX_OTEL_FETCH_DEPS ON CACHE BOOL "Download dependencies") set(NGX_OTEL_FETCH_DEPS ON CACHE BOOL "Download dependencies")
set(NGX_OTEL_PROTO_DIR "" CACHE PATH "OTel proto files root") set(NGX_OTEL_PROTO_DIR "" CACHE PATH "OTel proto files root")
set(NGX_OTEL_DEV OFF CACHE BOOL "Enforce compiler warnings")
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo) set(CMAKE_BUILD_TYPE RelWithDebInfo)
@ -99,7 +100,9 @@ add_custom_command(
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
add_compile_options(-Wall -Wtype-limits -Werror) if (NGX_OTEL_DEV)
add_compile_options(-Wall -Wtype-limits -Werror)
endif()
add_library(ngx_otel_module MODULE add_library(ngx_otel_module MODULE
src/http_module.cpp src/http_module.cpp