Skip to content

Commit ce97814

Browse files
authored
Merge pull request #247 from chobits/for_pull_request
README.md: added workflow link
2 parents 99202bf + 980ee06 commit ce97814

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ jobs:
8080
run: |
8181
pwd
8282
cd nginx
83-
sed -i -e "s+#LUA_PACKAGE_PATH+lua_package_path \"/opt/nginx/lib/lua/?.lua;;\";+" ../t/*.t
84-
grep -i lua_package_path ../t/*.t
83+
#sed -i -e "s+#LUA_PACKAGE_PATH+lua_package_path \"/opt/nginx/lib/lua/?.lua;;\";+" ../t/*.t
84+
#grep -i lua_package_path ../t/*.t
85+
export TEST_NGINX_GLOBALS_HTTP='lua_package_path "/opt/nginx/lib/lua/?.lua;;";'
8586
nginx_tests_lib_path=../nginx-tests/lib
8687
proxy_connect_test_cases=../t/
8788
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH

.github/workflows/test_nginx_lastest_commit.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ jobs:
7676
run: |
7777
pwd
7878
cd nginx
79-
sed -i -e "s+#LUA_PACKAGE_PATH+lua_package_path \"/opt/nginx/lib/lua/?.lua;;\";+" ../t/*.t
80-
grep -i lua_package_path ../t/*.t
79+
#sed -i -e "s+#LUA_PACKAGE_PATH+lua_package_path \"/opt/nginx/lib/lua/?.lua;;\";+" ../t/*.t
80+
#grep -i lua_package_path ../t/*.t
81+
export TEST_NGINX_GLOBALS_HTTP='lua_package_path "/opt/nginx/lib/lua/?.lua;;";'
8182
nginx_tests_lib_path=../nginx-tests/lib
8283
proxy_connect_test_cases=../t/
8384
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH

.github/workflows/test_openresty.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ jobs:
5151
- name: test
5252
run: |
5353
pwd
54-
sed -i -e "s+#LUA_PACKAGE_PATH+lua_package_path \"/opt/openresty/lualib//?.lua;;\";+" ./t/*.t
55-
grep -i lua_package_path ./t/*.t
54+
#sed -i -e "s+#LUA_PACKAGE_PATH+lua_package_path \"/opt/openresty/lualib//?.lua;;\";+" ./t/*.t
55+
#grep -i lua_package_path ./t/*.t
56+
export TEST_NGINX_GLOBALS_HTTP='lua_package_path "/opt/openresty/lualib/?.lua;;";'
5657
nginx_tests_lib_path=./nginx-tests/lib
5758
proxy_connect_test_cases=./t/
5859
#export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,21 @@ Test Suite
260260

261261
```bash
262262
$ hg clone http://hg.nginx.org/nginx-tests/
263+
264+
# If you use latest lua-nginx-module that needs lua-resty-core and
265+
# lua-resty-lrucache, you should add "lua_package_path ...;" directive
266+
# into nginx.conf of test cases. You can use the following command:
267+
#
268+
# $ export TEST_NGINX_GLOBALS_HTTP='lua_package_path "/path/to/nginx/lib/lua/?.lua;;";'
269+
263270
$ export TEST_NGINX_BINARY=/path/to/nginx/binary
264271
$ prove -v -I /path/to/nginx-tests/lib /path/to/ngx_http_proxy_connect_module/t/
265272
```
266273

274+
* For the complete process of building and testing this module, see:
275+
* workflow files: [here](https://github.com/chobits/ngx_http_proxy_connect_module/tree/master/.github/workflows)
276+
* runs from all workflows: [here](https://github.com/chobits/ngx_http_proxy_connect_module/actions)
277+
267278
Error Log
268279
=========
269280

0 commit comments

Comments
 (0)