chore(CI): fix broken CI

ADD-SP · Jan 25, 2025 · 8c00cff · 8c00cff
1 parent 68b0eac
commit 8c00cff
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,6 @@
 name: test
 
-on: 
+on:
   push:
     branches:
   pull_request:
@@ -23,7 +23,7 @@ jobs:
         install-type:  ['static module', 'dynamic module']
     steps:
       - uses: actions/checkout@v2
-        with: 
+        with:
           ref: ${{ github.ref }}
       - uses: actions/setup-python@v2
         with:
@@ -33,12 +33,21 @@ jobs:
         run: |
           sudo apt-get --yes update
           sudo apt-get install --yes libsodium23 libsodium-dev build-essential zlib1g-dev libpcre3 libpcre3-dev libssl-dev libxslt1-dev libxml2-dev libgeoip-dev libgd-dev libperl-dev uthash-dev flex bison
+          sudo apt-get remove --yes python3-urllib3
           sudo pip install lastversion
+
+      - name: Install libinjection
+        run: |
+          git clone https://github.com/libinjection/libinjection.git libinjection-src
+          cd libinjection-src
+          ./autogen.sh
+          ./configure --prefix=$pwd/../libinjection
+          make -j$(nproc)
+          sudo make install
       - name: Download ${{ matrix.nginx-version }}
         run: |
           chmod 777 -R ${{ github.workspace }}
           sudo make parser
-          sudo git clone https://github.com/libinjection/libinjection.git inc/libinjection
           if [ ${{ matrix.nginx-version }} = 'stable nginx' ] ; then  \
             version='stable' ;\
           else  \
@@ -55,11 +64,11 @@ jobs:
           else \
             opt='--add-dynamic-module' ;\
           fi
-          ./configure ${opt}=.. --with-cc-opt='-Wno-unused-but-set-variable -Wno-unused-function -fstack-protector-strong -Wno-sign-compare' --with-http_realip_module
+          LIB_INJECTION=../libinjection ./configure ${opt}=.. --with-cc-opt='-Wno-unused-but-set-variable -Wno-unused-function -fstack-protector-strong -Wno-sign-compare' --with-http_realip_module
       - name: Install ${{ matrix.nginx-version }}
         run: |
           cd nginx-src
-          make
+          make -j$(nproc)
           sudo make install
           sudo useradd nginx -s /sbin/nologin -M
           sudo chmod 777 -R /usr/local/nginx