From feaf0d749a6c570bc86a00b1fda412e684b0f213 Mon Sep 17 00:00:00 2001 From: Caio Casimiro Date: Thu, 7 Sep 2023 12:23:23 +0100 Subject: [PATCH] wip --- .github/workflows/job-build-tests.yml | 8 ++++++++ assets/release/Dockerfiles/Dockerfile.ubuntu-22.04 | 2 +- src/wasm/ngx_wasm_ops.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/job-build-tests.yml b/.github/workflows/job-build-tests.yml index a0fdb5c0e..2721412b0 100644 --- a/.github/workflows/job-build-tests.yml +++ b/.github/workflows/job-build-tests.yml @@ -51,6 +51,14 @@ jobs: #if: ${{ false }} runs-on: ${{ inputs.os }} steps: + - name: 'Setup deps - apt-get gcc' + if: ${{ !env.ACT && contains(inputs.cc, 'gcc') }} + run: sudo apt-get update && sudo apt-get install -y ${CC} libstdc++-${CC#*-}-dev lcov + + - name: 'Setup deps - apt-get clang' + if: ${{ !env.ACT && contains(inputs.cc, 'clang') }} + run: sudo apt-get update && sudo apt-get install -y ${CC} lcov + - uses: actions/checkout@v3 - name: 'Setup cache - work/ dir' uses: actions/cache@v3 diff --git a/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04 b/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04 index 2f6bfc386..132290762 100644 --- a/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04 +++ b/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04 @@ -16,7 +16,7 @@ RUN apt-get update && \ git \ pkg-config \ libglib2.0-dev \ - clang \ + clang-15 \ curl \ binfmt-support \ qemu-user-static diff --git a/src/wasm/ngx_wasm_ops.c b/src/wasm/ngx_wasm_ops.c index e7d59153f..a11bc5f70 100644 --- a/src/wasm/ngx_wasm_ops.c +++ b/src/wasm/ngx_wasm_ops.c @@ -126,7 +126,7 @@ ngx_wasm_ops_plan_load(ngx_wasm_ops_plan_t *plan, ngx_log_t *log) ngx_uint_t *fid; ngx_array_t *ids; ngx_wasm_op_t *op; - ngx_wasm_ops_pipeline_t *pipeline; + ngx_wasm_ops_pipeline_t *pipeline = NULL; dd("enter");