updated workflow actions to check compatibility with all current versions of Zabbix

aiantsen · aiantsen · commit 13f0226d2115 · 2025-03-04T15:21:10.000+02:00
diff --git a/.github/workflows/compatibility_50.yaml b/.github/workflows/compatibility_50.yaml
@@ -17,15 +17,16 @@ env:
 jobs:
   compatibility:
     name: Compatibility test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Install packages
         run: |
           curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg
           echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | sudo tee /etc/apt/sources.list.d/pgdg.list
-          sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-13 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev
+          sudo add-apt-repository ppa:ondrej/php
+          sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libzip-dev php7.4 libapache2-mod-php7.4 php7.4-common php7.4-fpm php7.4-gd php7.4-mbstring php7.4-xml php7.4-zip php7.4-ldap
       - name: Build from sources
         run: |
           WORKDIR=$(pwd)
@@ -41,23 +42,23 @@ jobs:
           sudo rm /var/www/html/index.html
           sudo cp -a . /var/www/html/
           sudo cp $WORKDIR/${{ env.CONFIG_PATH }}/zabbix.conf.php /var/www/html/conf/
-          sudo cp $WORKDIR/${{ env.CONFIG_PATH }}/pg_hba.conf /etc/postgresql/13/main/pg_hba.conf
+          sudo cp $WORKDIR/${{ env.CONFIG_PATH }}/pg_hba.conf /etc/postgresql/14/main/pg_hba.conf
           sudo chown -R www-data:www-data /var/www/html/
-          sudo sed -i "s/post_max_size = 8M/post_max_size = 16M/g" /etc/php/8.1/apache2/php.ini
-          sudo sed -i "s/max_execution_time = 30/max_execution_time = 300/g" /etc/php/8.1/apache2/php.ini
-          sudo sed -i "s/max_input_time = 60/max_input_time = 300/g" /etc/php/8.1/apache2/php.ini
+          sudo sed -i "s/post_max_size = 8M/post_max_size = 16M/g" /etc/php/7.4/fpm/php.ini
+          sudo sed -i "s/max_execution_time = 30/max_execution_time = 300/g" /etc/php/7.4/fpm/php.ini
+          sudo sed -i "s/max_input_time = 60/max_input_time = 300/g" /etc/php/7.4/fpm/php.ini
           sudo locale-gen en_US.UTF-8
           sudo update-locale
       - name: Prepare environment
         run: |
           sudo addgroup --system --quiet zabbix
           sudo adduser --quiet --system --disabled-login --ingroup zabbix --home /var/lib/zabbix --no-create-home zabbix
-          sudo mkdir -p /var/run/postgresql/13-main.pg_stat_tmp
+          sudo mkdir -p /var/run/postgresql/14-main.pg_stat_tmp
           sudo chown -R postgres. /var/run/postgresql/
-          sudo touch /var/run/postgresql/13-main.pg_stat_tmp/global.tmp
-          sudo chmod 0777 /var/run/postgresql/13-main.pg_stat_tmp/global.tmp
-          sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/13/main/postgresql.conf
-          (sudo -u postgres /usr/lib/postgresql/13/bin/postgres -D /var/lib/postgresql/13/main -c config_file=/etc/postgresql/13/main/postgresql.conf)&
+          sudo touch /var/run/postgresql/14-main.pg_stat_tmp/global.tmp
+          sudo chmod 0777 /var/run/postgresql/14-main.pg_stat_tmp/global.tmp
+          sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/14/main/postgresql.conf
+          (sudo -u postgres /usr/lib/postgresql/14/bin/postgres -D /var/lib/postgresql/14/main -c config_file=/etc/postgresql/14/main/postgresql.conf)&
           sleep 5
           cd /tmp/zabbix-branch/database/postgresql
           sudo -u postgres createuser zabbix
diff --git a/.github/workflows/compatibility_60.yaml b/.github/workflows/compatibility_60.yaml
@@ -17,10 +17,10 @@ env:
 jobs:
   compatibility:
     name: Compatibility test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Install packages
         run: |
           sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev
diff --git a/.github/workflows/compatibility_70.yaml b/.github/workflows/compatibility_70.yaml
@@ -17,17 +17,19 @@ env:
 jobs:
   compatibility:
     name: Compatibility test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
       - name: Install packages
         run: |
-          sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev zabbix-sender
+          sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-16 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.3-pgsql php8.3-bcmath php8.3-xml php8.3-gd php8.3-ldap php8.3-mbstring libzip-dev
       - name: Build from sources
         run: |
           WORKDIR=$(pwd)
           cd /tmp/
+          sudo addgroup --system --quiet zabbix
+          sudo adduser --quiet --system --disabled-login --ingroup zabbix --home /var/lib/zabbix --no-create-home zabbix
           git -c advice.detachedHead=false clone https://git.zabbix.com/scm/zbx/zabbix.git --branch ${{ env.ZABBIX_BRANCH }} --depth 1 --single-branch /tmp/zabbix-branch
           cd /tmp/zabbix-branch
           ./bootstrap.sh
@@ -59,21 +61,19 @@ jobs:
           sudo rm /var/www/html/index.html
           sudo cp -a . /var/www/html/
           sudo cp $WORKDIR/${{ env.CONFIG_PATH }}/zabbix.conf.php /var/www/html/conf/
-          sudo cp $WORKDIR/${{ env.CONFIG_PATH }}/pg_hba.conf /etc/postgresql/14/main/pg_hba.conf
+          sudo cp $WORKDIR/${{ env.CONFIG_PATH }}/pg_hba.conf /etc/postgresql/16/main/pg_hba.conf
           sudo chown -R www-data:www-data /var/www/html/
-          sudo sed -i "s/post_max_size = 8M/post_max_size = 16M/g" /etc/php/8.1/apache2/php.ini
-          sudo sed -i "s/max_execution_time = 30/max_execution_time = 300/g" /etc/php/8.1/apache2/php.ini
-          sudo sed -i "s/max_input_time = 60/max_input_time = 300/g" /etc/php/8.1/apache2/php.ini
+          sudo sed -i "s/post_max_size = 8M/post_max_size = 16M/g" /etc/php/8.3/apache2/php.ini
+          sudo sed -i "s/max_execution_time = 30/max_execution_time = 300/g" /etc/php/8.3/apache2/php.ini
+          sudo sed -i "s/max_input_time = 60/max_input_time = 300/g" /etc/php/8.3/apache2/php.ini
           sudo locale-gen en_US.UTF-8
           sudo update-locale
       - name: Prepare environment
         run: |
-          sudo addgroup --system --quiet zabbix
-          sudo adduser --quiet --system --disabled-login --ingroup zabbix --home /var/lib/zabbix --no-create-home zabbix
-          sudo mkdir -p /var/run/postgresql/14-main.pg_stat_tmp
-          sudo touch /var/run/postgresql/14-main.pg_stat_tmp/global.tmp
-          sudo chmod 0777 /var/run/postgresql/14-main.pg_stat_tmp/global.tmp
-          (sudo -u postgres /usr/lib/postgresql/14/bin/postgres -D /var/lib/postgresql/14/main -c config_file=/etc/postgresql/14/main/postgresql.conf)&
+          sudo mkdir -p /var/run/postgresql/16-main.pg_stat_tmp
+          sudo touch /var/run/postgresql/16-main.pg_stat_tmp/global.tmp
+          sudo chmod 0777 /var/run/postgresql/16-main.pg_stat_tmp/global.tmp
+          (sudo -u postgres /usr/lib/postgresql/16/bin/postgres -D /var/lib/postgresql/16/main -c config_file=/etc/postgresql/16/main/postgresql.conf)&
           sleep 5
           cd /tmp/zabbix-branch/database/postgresql
           sudo -u postgres createuser zabbix
diff --git a/.github/workflows/compatibility_72.yaml b/.github/workflows/compatibility_72.yaml
@@ -17,17 +17,19 @@ env:
 jobs:
   compatibility:
     name: Compatibility test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
       - name: Install packages
         run: |
-          sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-14 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.1-pgsql php8.1-bcmath php8.1-xml php8.1-gd php8.1-ldap php8.1-mbstring libzip-dev zabbix-sender
+          sudo apt update && sudo apt install -y git sudo gcc make automake pkg-config postgresql-16 libpostgresql-ocaml-dev libxml2-dev libpcre3-dev libevent-dev apache2 libapache2-mod-php php8.3-pgsql php8.3-bcmath php8.3-xml php8.3-gd php8.3-ldap php8.3-mbstring libzip-dev
       - name: Build from sources
         run: |
           WORKDIR=$(pwd)
           cd /tmp/
+          sudo addgroup --system --quiet zabbix
+          sudo adduser --quiet --system --disabled-login --ingroup zabbix --home /var/lib/zabbix --no-create-home zabbix
           git -c advice.detachedHead=false clone https://git.zabbix.com/scm/zbx/zabbix.git --branch ${{ env.ZABBIX_BRANCH }} --depth 1 --single-branch /tmp/zabbix-branch
           cd /tmp/zabbix-branch
           ./bootstrap.sh
@@ -59,21 +61,19 @@ jobs:
           sudo rm /var/www/html/index.html
           sudo cp -a . /var/www/html/
           sudo cp $WORKDIR/${{ env.CONFIG_PATH }}/zabbix.conf.php /var/www/html/conf/
-          sudo cp $WORKDIR/${{ env.CONFIG_PATH }}/pg_hba.conf /etc/postgresql/14/main/pg_hba.conf
+          sudo cp $WORKDIR/${{ env.CONFIG_PATH }}/pg_hba.conf /etc/postgresql/16/main/pg_hba.conf
           sudo chown -R www-data:www-data /var/www/html/
-          sudo sed -i "s/post_max_size = 8M/post_max_size = 16M/g" /etc/php/8.1/apache2/php.ini
-          sudo sed -i "s/max_execution_time = 30/max_execution_time = 300/g" /etc/php/8.1/apache2/php.ini
-          sudo sed -i "s/max_input_time = 60/max_input_time = 300/g" /etc/php/8.1/apache2/php.ini
+          sudo sed -i "s/post_max_size = 8M/post_max_size = 16M/g" /etc/php/8.3/apache2/php.ini
+          sudo sed -i "s/max_execution_time = 30/max_execution_time = 300/g" /etc/php/8.3/apache2/php.ini
+          sudo sed -i "s/max_input_time = 60/max_input_time = 300/g" /etc/php/8.3/apache2/php.ini
           sudo locale-gen en_US.UTF-8
           sudo update-locale
       - name: Prepare environment
         run: |
-          sudo addgroup --system --quiet zabbix
-          sudo adduser --quiet --system --disabled-login --ingroup zabbix --home /var/lib/zabbix --no-create-home zabbix
-          sudo mkdir -p /var/run/postgresql/14-main.pg_stat_tmp
-          sudo touch /var/run/postgresql/14-main.pg_stat_tmp/global.tmp
-          sudo chmod 0777 /var/run/postgresql/14-main.pg_stat_tmp/global.tmp
-          (sudo -u postgres /usr/lib/postgresql/14/bin/postgres -D /var/lib/postgresql/14/main -c config_file=/etc/postgresql/14/main/postgresql.conf)&
+          sudo mkdir -p /var/run/postgresql/16-main.pg_stat_tmp
+          sudo touch /var/run/postgresql/16-main.pg_stat_tmp/global.tmp
+          sudo chmod 0777 /var/run/postgresql/16-main.pg_stat_tmp/global.tmp
+          (sudo -u postgres /usr/lib/postgresql/16/bin/postgres -D /var/lib/postgresql/16/main -c config_file=/etc/postgresql/16/main/postgresql.conf)&
           sleep 5
           cd /tmp/zabbix-branch/database/postgresql
           sudo -u postgres createuser zabbix
