Skip to content

Commit

Permalink
Fix notes: simplify the workflow.
Browse files Browse the repository at this point in the history
  • Loading branch information
jimf5 committed Nov 15, 2024
1 parent c002c68 commit b6c1fa5
Showing 1 changed file with 7 additions and 35 deletions.
42 changes: 7 additions & 35 deletions .github/workflows/nginx-otel-module-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y cmake libc-ares-dev libre2-dev
sudo apt-get install -y cmake libc-ares-dev libre2-dev python3-venv
- name: Checkout nginx
uses: actions/checkout@v4
with:
repository: nginx/nginx
path: nginx
- name: Configure nginx
- name: Build nginx
working-directory: nginx
run: |
auto/configure --with-compat --with-debug --with-http_ssl_module \
--with-http_v2_module --with-http_v3_module
make -j $(nproc)
run: auto/configure --with-compat
- name: Create build directory
run: mkdir build
Expand All @@ -30,38 +34,6 @@ jobs:
cmake -DNGX_OTEL_NGINX_BUILD_DIR=${GITHUB_WORKSPACE}/nginx/objs \
-DNGX_OTEL_DEV=ON ${GITHUB_WORKSPACE}
make -j $(nproc)
strip ngx_otel_module.so
- name: Archive module
uses: actions/upload-artifact@v4
with:
name: nginx-otel-module
path: build/ngx_otel_module.so
test-module:
needs: build-module
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Download module
uses: actions/download-artifact@v4
with:
name: nginx-otel-module
path: build
- 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-debug --with-http_ssl_module \
--with-http_v2_module --with-http_v3_module
make -j $(nproc)
- name: Download otelcol
uses: robinraju/[email protected]
with:
Expand All @@ -73,7 +45,7 @@ jobs:
working-directory: tests
env:
TEST_NGINX_GLOBALS: |
load_module ${{ github.workspace }}/build/ngx_otel_module.so;
load_module ../build/ngx_otel_module.so;
run: |
python -m venv venv
source venv/bin/activate
Expand Down

0 comments on commit b6c1fa5

Please sign in to comment.