Merge upstream into no-cmake

This commit is contained in:
daroche 2025-08-05 22:38:00 +02:00
commit 6e138d16b0
3 changed files with 47 additions and 2 deletions

45
.github/workflows/alpine.yml vendored Normal file
View file

@ -0,0 +1,45 @@
name: Alpine build
on:
push:
branches:
- main
pull_request:
jobs:
test:
runs-on: ubuntu-latest
container: alpine
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install dependencies
run: |
apk add build-base openssl-dev zlib-dev pcre2-dev \
cmake git grpc-dev protobuf-dev \
python3
- name: Checkout nginx
uses: actions/checkout@v4
with:
repository: nginx/nginx
path: nginx
- name: Build nginx
working-directory: nginx
run: |
auto/configure --with-compat --with-http_ssl_module \
--with-http_v2_module --with-http_v3_module
make -j $(nproc)
- name: Build module
working-directory: nginx
run: |
NGX_OTEL_CMAKE_OPTS="-D NGX_OTEL_GRPC=package" \
auto/configure --with-compat --add-dynamic-module=..
make -j $(nproc) modules
- name: Install test dependencies
run: |
python -m venv tests-venv
tests-venv/bin/pip install -r tests/requirements.txt
- name: Run tests
run: |
tests-venv/bin/pytest tests --maxfail=10 --nginx=nginx/objs/nginx \
--module=nginx/objs/ngx_otel_module.so

View file

@ -7,7 +7,7 @@ on:
pull_request:
jobs:
build-module:
test:
runs-on: ubuntu-22.04
steps:
- name: Checkout repository

View file

@ -296,10 +296,10 @@ ngx_int_t setHeader(ngx_http_request_t* r, StrView name, StrView value)
return NGX_ERROR;
}
*header = {};
header->hash = hash;
header->key = toNgxStr(name);
header->lowcase_key = header->key.data;
header->next = NULL;
}
header->value = toNgxStr(value);