Skip to content

nginx-buildbot: moved cpp_test module build to a separate job. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oxpa merged 1 commit into from
May 28, 2025
Merged

nginx-buildbot: moved cpp_test module build to a separate job. #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions .github/workflows/nginx-buildbot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ jobs:
--with-stream_realip_module \
--with-threads \
--with-compat",
"NGINX_CONFIGURE_ADD_STD_COMMON": "--with-cpp_test_module",
"NGINX_CONFIGURE_ADD_CPP_TEST": "--with-cpp_test_module",
"NGINX_CONFIGURE_ADD_STD": "--with-http_perl_module \
--with-http_xslt_module \
--with-http_image_filter_module",
Expand All @@ -238,7 +238,7 @@ jobs:

NGINX_CONFIGURE_CMD_MIN=$(echo $ENV_JSON | jq -r '.NGINX_CONFIGURE_CMD_MIN')
NGINX_CONFIGURE_CMD_COMMON=$(echo $ENV_JSON | jq -r '.NGINX_CONFIGURE_CMD_COMMON')
NGINX_CONFIGURE_ADD_STD_COMMON=$(echo $ENV_JSON | jq -r '.NGINX_CONFIGURE_ADD_STD_COMMON')
NGINX_CONFIGURE_ADD_CPP_TEST=$(echo $ENV_JSON | jq -r '.NGINX_CONFIGURE_ADD_CPP_TEST')
NGINX_CONFIGURE_ADD_STD=$(echo $ENV_JSON | jq -r '.NGINX_CONFIGURE_ADD_STD')
NGINX_CONFIGURE_ADD_STD_MODULES=$(echo $ENV_JSON | jq -r '.NGINX_CONFIGURE_ADD_STD_MODULES')
NGINX_CONFIGURE_ADD_COMMON=$(echo $ENV_JSON | jq -r '.NGINX_CONFIGURE_ADD_COMMON')
Expand Down Expand Up @@ -291,7 +291,7 @@ jobs:
echo NGINX_CONFIGURE_CMD_MIN="$NGINX_CONFIGURE_CMD_MIN" >> $GITHUB_ENV
echo NGINX_CONFIGURE_CMD_COMMON="$NGINX_CONFIGURE_CMD_COMMON" >> $GITHUB_ENV
echo NGINX_CONFIGURE_ADD_COMMON="$NGINX_CONFIGURE_ADD_COMMON" >> $GITHUB_ENV
echo NGINX_CONFIGURE_ADD_STD_COMMON="$NGINX_CONFIGURE_ADD_STD_COMMON" >> $GITHUB_ENV
echo NGINX_CONFIGURE_ADD_CPP_TEST="$NGINX_CONFIGURE_ADD_CPP_TEST" >> $GITHUB_ENV
echo NGINX_CONFIGURE_ADD_STD="$NGINX_CONFIGURE_ADD_STD" >> $GITHUB_ENV
echo NGINX_CONFIGURE_ADD_STD_MODULES="$NGINX_CONFIGURE_ADD_STD_MODULES" >> $GITHUB_ENV
echo NGINX_CONFIGURE_ADD_GEOIP="$NGINX_CONFIGURE_ADD_GEOIP" >> $GITHUB_ENV
Expand Down Expand Up @@ -339,11 +339,22 @@ jobs:
- name: Cleanup
run: make clean

- name: Configure and build common w/ cpp_test module
run: |
$NGINX_CONFIGURE_CMD_COMMON \
$NGINX_CONFIGURE_ADD_CPP_TEST \
--with-cc-opt="$NGINX_CONFIGURE_ADD_AUX_CC_OPT" \
--with-ld-opt="$NGINX_CONFIGURE_ADD_AUX_LD_OPT" \
|| cat objs/autoconf.err
make -j$(nproc) -k || make

- name: Cleanup
run: make clean

- name: Configure and build package-max
run: |
$NGINX_CONFIGURE_CMD_COMMON \
$NGINX_CONFIGURE_ADD_COMMON \
$NGINX_CONFIGURE_ADD_STD_COMMON \
$NGINX_CONFIGURE_ADD_STD \
$NGINX_CONFIGURE_ADD_GEOIP \
--with-cc-opt="$CC_OPT" \
Expand All @@ -368,7 +379,6 @@ jobs:
run: |
$NGINX_CONFIGURE_CMD_COMMON \
$NGINX_CONFIGURE_ADD_COMMON \
$NGINX_CONFIGURE_ADD_STD_COMMON \
$NGINX_CONFIGURE_ADD_STD \
$NGINX_CONFIGURE_ADD_GEOIP \
--with-cc-opt="$CC_OPT" \
Expand All @@ -394,7 +404,6 @@ jobs:
run: |
$NGINX_CONFIGURE_CMD_COMMON \
$NGINX_CONFIGURE_ADD_COMMON \
$NGINX_CONFIGURE_ADD_STD_COMMON \
$NGINX_CONFIGURE_ADD_STD_MODULES \
$NGINX_CONFIGURE_ADD_GEOIP_MODULES \
--with-cc-opt="$CC_OPT" \
Expand All @@ -406,7 +415,6 @@ jobs:
run: |
$NGINX_CONFIGURE_CMD_COMMON \
$NGINX_CONFIGURE_ADD_COMMON \
$NGINX_CONFIGURE_ADD_STD_COMMON \
--with-cc-opt="$CC_OPT" \
--with-ld-opt="$LD_OPT" \
|| cat objs/autoconf.err
Expand All @@ -430,7 +438,6 @@ jobs:
run: |
$NGINX_CONFIGURE_CMD_COMMON \
$NGINX_CONFIGURE_ADD_COMMON \
$NGINX_CONFIGURE_ADD_STD_COMMON \
$NGINX_CONFIGURE_ADD_STD_MODULES \
$NGINX_CONFIGURE_ADD_GEOIP_MODULES \
--with-cc-opt="$CC_OPT" \
Expand All @@ -443,7 +450,6 @@ jobs:
run: |
$NGINX_CONFIGURE_CMD_COMMON \
$NGINX_CONFIGURE_ADD_COMMON \
$NGINX_CONFIGURE_ADD_STD_COMMON \
--with-cc-opt="$CC_OPT" \
--with-ld-opt="$LD_OPT" \
--with-debug \
Expand All @@ -468,7 +474,6 @@ jobs:
run: |
$NGINX_CONFIGURE_CMD_COMMON \
$NGINX_CONFIGURE_ADD_COMMON \
$NGINX_CONFIGURE_ADD_STD_COMMON \
$NGINX_CONFIGURE_ADD_STD \
$NGINX_CONFIGURE_ADD_GEOIP \
$NGINX_CONFIGURE_ADD_AIO \
Expand Down Expand Up @@ -506,7 +511,6 @@ jobs:
run: |
$NGINX_CONFIGURE_CMD_COMMON \
$NGINX_CONFIGURE_ADD_COMMON \
$NGINX_CONFIGURE_ADD_STD_COMMON \
$NGINX_CONFIGURE_ADD_STD \
$NGINX_CONFIGURE_ADD_GEOIP \
$NGINX_CONFIGURE_ADD_AIO \
Expand Down Expand Up @@ -551,7 +555,6 @@ jobs:
run: |
$NGINX_CONFIGURE_CMD_COMMON \
$NGINX_CONFIGURE_ADD_COMMON \
$NGINX_CONFIGURE_ADD_STD_COMMON \
$NGINX_CONFIGURE_ADD_STD \
$NGINX_CONFIGURE_ADD_GEOIP \
--with-cc-opt="$CC_OPT" \
Expand Down