Merge pull request #817 from jajik/ci-update

[1.3.x] Resolve MODCLUSTER-829 and add CI for it
modcluster · Jul 30, 2024 · 2577249 · 2577249
2 parents 8e51de2 + 4b8810a
commit 2577249
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
       - name: Create container and build
         run: |
           {
-              echo 'FROM fedora:39'
+              echo 'FROM fedora:40'
               echo 'RUN dnf install cmake httpd-devel ${{ matrix.compiler }} -y'
               echo 'RUN dnf groupinstall "C Development Tools and Libraries" -y'
               echo 'RUN dnf clean all'
@@ -76,7 +76,7 @@ jobs:
       - name: Create container and build
         run: |
           {
-              echo 'FROM fedora:39'
+              echo 'FROM fedora:40'
               echo 'RUN dnf install httpd-devel redhat-rpm-config -y'
               echo 'RUN dnf groupinstall "C Development Tools and Libraries" -y'
               echo 'RUN dnf clean all'
@@ -95,3 +95,50 @@ jobs:
               echo 'done;'
           } > podmanfile
           podman build -f ./podmanfile
+
+  make-with-httpd-trunk:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          path: mod_proxy_cluster
+      - name: Checkout latest httpd
+        uses: actions/checkout@v4
+        with:
+          repository: apache/httpd
+          path: httpd
+      - name: Checkout apr for httpd
+        uses: actions/checkout@v4
+        with:
+          repository: apache/apr
+          path: httpd/srclib/apr
+      - name: Install necessary packages
+        run: |
+          ls
+          sudo apt-get update
+          sudo apt-get install cmake gcc cmake gcc make libtool libtool-bin python3 autoconf libxml2-dev libpcre2-dev -y
+      - name: Build httpd
+        run: |
+          ls
+          export "APACHE_DIR=/usr/local/apache2/"
+          cd httpd
+          ./buildconf
+          ./configure --prefix=/usr/local/apache2 --with-included-apr --enable-proxy-ajp --enable-maintainer-mode \
+                      --enable-so --enable-proxy --enable-proxy-http --enable-proxy-wstunned --enable-proxy-hcheck \
+                      --with-port=8000
+          sudo make
+          sudo make install
+      - name: Build mod_proxy_cluster
+        run: |
+          ls
+          cd mod_proxy_cluster/native
+          for module in advertise/ mod_proxy_cluster/ mod_cluster_slotmem/ mod_manager/; do \
+            cd $module; \
+            sh buildconf; \
+            ./configure CFLAGS="-Wall -Werror" --with-apxs=/usr/local/apache2/bin/apxs; \
+            make clean; \
+            make || exit 1; \
+            cd ..; \
+          done;
+
diff --git a/native/advertise/mod_advertise.c b/native/advertise/mod_advertise.c
@@ -284,7 +284,7 @@ static const char *cmd_advertise_h(cmd_parms *cmd, void *dummy,
 
 static const char *hex = "0123456789abcdef";
 
-apr_status_t ma_advertise_server(server_rec *server, int type)
+static apr_status_t ma_advertise_server(server_rec *server, int type)
 {
     char buf[MA_BSIZE];
     char dat[APR_RFC822_DATE_LEN];
@@ -420,7 +420,7 @@ static apr_status_t ma_group_join(const char *addr, apr_port_t port,
     return APR_SUCCESS;
 }
 
-static void ma_group_leave()
+static void ma_group_leave(void)
 {
     if (ma_mgroup_socket) {
         apr_mcast_leave(ma_mgroup_socket, ma_mgroup_sa,