Skip to content

Commit b6c1fa5

Browse files
committed
Fix notes: simplify the workflow.
1 parent c002c68 commit b6c1fa5

File tree

1 file changed

+7
-35
lines changed

1 file changed

+7
-35
lines changed

.github/workflows/nginx-otel-module-check.yml

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@ jobs:
1313
- name: Install dependencies
1414
run: |
1515
sudo apt-get update
16-
sudo apt-get install -y cmake libc-ares-dev libre2-dev
16+
sudo apt-get install -y cmake libc-ares-dev libre2-dev python3-venv
1717
- name: Checkout nginx
1818
uses: actions/checkout@v4
1919
with:
2020
repository: nginx/nginx
2121
path: nginx
22-
- name: Configure nginx
22+
- name: Build nginx
2323
working-directory: nginx
24+
run: |
25+
auto/configure --with-compat --with-debug --with-http_ssl_module \
26+
--with-http_v2_module --with-http_v3_module
27+
make -j $(nproc)
2428
run: auto/configure --with-compat
2529
- name: Create build directory
2630
run: mkdir build
@@ -30,38 +34,6 @@ jobs:
3034
cmake -DNGX_OTEL_NGINX_BUILD_DIR=${GITHUB_WORKSPACE}/nginx/objs \
3135
-DNGX_OTEL_DEV=ON ${GITHUB_WORKSPACE}
3236
make -j $(nproc)
33-
strip ngx_otel_module.so
34-
- name: Archive module
35-
uses: actions/upload-artifact@v4
36-
with:
37-
name: nginx-otel-module
38-
path: build/ngx_otel_module.so
39-
test-module:
40-
needs: build-module
41-
runs-on: ubuntu-latest
42-
steps:
43-
- name: Checkout repository
44-
uses: actions/checkout@v4
45-
- name: Setup python
46-
uses: actions/setup-python@v5
47-
with:
48-
python-version: '3.12'
49-
- name: Download module
50-
uses: actions/download-artifact@v4
51-
with:
52-
name: nginx-otel-module
53-
path: build
54-
- name: Checkout nginx
55-
uses: actions/checkout@v4
56-
with:
57-
repository: nginx/nginx
58-
path: nginx
59-
- name: Build nginx
60-
working-directory: nginx
61-
run: |
62-
auto/configure --with-compat --with-debug --with-http_ssl_module \
63-
--with-http_v2_module --with-http_v3_module
64-
make -j $(nproc)
6537
- name: Download otelcol
6638
uses: robinraju/[email protected]
6739
with:
@@ -73,7 +45,7 @@ jobs:
7345
working-directory: tests
7446
env:
7547
TEST_NGINX_GLOBALS: |
76-
load_module ${{ github.workspace }}/build/ngx_otel_module.so;
48+
load_module ../build/ngx_otel_module.so;
7749
run: |
7850
python -m venv venv
7951
source venv/bin/activate

0 commit comments

Comments
 (0)