|
29 | 29 | sudo apt-get install \ |
30 | 30 | libssl-dev zlib1g-dev libpcre2-dev libxslt1-dev libgeoip-dev \ |
31 | 31 | libgd-dev libxml2-dev libedit-dev libperl-dev libtest-harness-perl \ |
32 | | - libgd-perl libgeoip-dev expect |
| 32 | + libgd-perl libgeoip-dev expect meson ninja-build |
33 | 33 |
|
34 | 34 | - name: Install x86 build dependencies |
35 | 35 | run: | |
|
56 | 56 | git clone https://github.com/quickjs-ng/quickjs quickjs-ng |
57 | 57 | cd quickjs-ng |
58 | 58 | git checkout v0.11.0 |
59 | | - CFLAGS="$CC_OPT -fPIC" LDFLAGS=$LD_OPT cmake -B build |
60 | | - cmake --build build --target qjs -j $(nproc) |
| 59 | + CFLAGS="$CC_OPT -fPIC" LDFLAGS=$LD_OPT meson setup build --prefix=$HOME/.local --libdir=lib |
| 60 | + meson compile -C build |
| 61 | + meson install -C build |
| 62 | + echo "PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV |
61 | 63 |
|
62 | 64 | - name: Configure and make njs |
63 | 65 | run: | |
@@ -103,8 +105,8 @@ jobs: |
103 | 105 | run: | |
104 | 106 | ./configure \ |
105 | 107 | --with-quickjs \ |
106 | | - --cc-opt="$CC_OPT -Iquickjs-ng" \ |
107 | | - --ld-opt="$LD_OPT -Lquickjs-ng/build" \ |
| 108 | + --cc-opt="$CC_OPT" \ |
| 109 | + --ld-opt="$LD_OPT" \ |
108 | 110 | || cat build/autoconf.err |
109 | 111 | $MAKE_UTILITY -j$(nproc) |
110 | 112 |
|
@@ -214,7 +216,7 @@ jobs: |
214 | 216 | - name: Configure and build nginx and njs modules with quickjs-ng, asan, static modules |
215 | 217 | run: | |
216 | 218 | cd nginx-source |
217 | | - $NGINX_CONFIGURE_CMD --with-cc-opt="$CC_OPT -I${{ github.workspace }}/quickjs-ng -fsanitize=address -DNJS_DEBUG_MEMORY -DNGX_DEBUG_PALLOC -DNGX_DEBUG_MALLOC" --with-ld-opt="$LD_OPT -L${{ github.workspace }}/quickjs-ng/build -fsanitize=address" --add-module=../nginx || cat objs/autoconf.err |
| 219 | + $NGINX_CONFIGURE_CMD --with-cc-opt="$CC_OPT -fsanitize=address -DNJS_DEBUG_MEMORY -DNGX_DEBUG_PALLOC -DNGX_DEBUG_MALLOC" --with-ld-opt="$LD_OPT -fsanitize=address" --add-module=../nginx || cat objs/autoconf.err |
218 | 220 | $MAKE_UTILITY -j$(nproc) |
219 | 221 |
|
220 | 222 | - name: Test njs modules, quickjs-ng, static modules |
@@ -242,7 +244,7 @@ jobs: |
242 | 244 | - name: Configure and build nginx and njs modules with quickjs-ng, asan, dynamic modules |
243 | 245 | run: | |
244 | 246 | cd nginx-source |
245 | | - $NGINX_CONFIGURE_CMD --with-debug --with-cc-opt="$CC_OPT -I${{ github.workspace }}/quickjs-ng -fsanitize=address -DNJS_DEBUG_MEMORY -DNGX_DEBUG_PALLOC -DNGX_DEBUG_MALLOC" --with-ld-opt="$LD_OPT -L${{ github.workspace }}/quickjs-ng/build -fsanitize=address" --add-dynamic-module=../nginx || cat objs/autoconf.err |
| 247 | + $NGINX_CONFIGURE_CMD --with-debug --with-cc-opt="$CC_OPT -fsanitize=address -DNJS_DEBUG_MEMORY -DNGX_DEBUG_PALLOC -DNGX_DEBUG_MALLOC" --with-ld-opt="$LD_OPT -fsanitize=address" --add-dynamic-module=../nginx || cat objs/autoconf.err |
246 | 248 | $MAKE_UTILITY -j$(nproc) modules |
247 | 249 | $MAKE_UTILITY -j$(nproc) |
248 | 250 |
|
|
0 commit comments