Merge branch 'main' into main

Author: justdave

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install docker-compose
-        run: sudo apt update && sudo apt install -y docker-compose
+        run: sudo apt-get update && sudo apt-get install -y docker-compose
       - name: Build the Docker images
         run: docker compose -f docker-compose.test.yml build
       - name: Run sanity tests
@@ -29,7 +29,7 @@ jobs:
 #    steps:
 #      - uses: actions/checkout@v4
 #      - name: Install docker-compose
-#        run: sudo apt update && sudo apt install -y docker-compose
+#        run: sudo apt-get update && sudo apt-get install -y docker-compose
 #      - name: Build the Docker images
 #        run: docker compose -f docker-compose.test.yml build
 #      - name: Run webservice tests
@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install docker-compose
-        run: sudo apt update && sudo apt install -y docker-compose
+        run: sudo apt-get update && sudo apt-get install -y docker-compose
       - name: Build the Docker images
         run: docker compose -f docker-compose.test.yml build
       - name: Run bmo specific tests
@@ -51,29 +51,29 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install docker-compose
-        run: sudo apt update && sudo apt install -y docker-compose
+        run: sudo apt-get update && sudo apt-get install -y docker-compose
       - name: Build the Docker images
         run: docker compose -f docker-compose.test-mariadb.yml build
       - name: Run bmo specific tests
         run: docker compose -f docker-compose.test-mariadb.yml run -e CI=1 bugzilla6.test test_bmo -q -f t/bmo/*.t
 
   test_bugzilla6_pg:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Install docker-compose
-        run: sudo apt update && sudo apt install -y docker-compose docker.io
+        run: sudo apt-get update && sudo apt-get install -y docker-compose
       - name: Build the Docker images
-        run: docker-compose -f docker-compose.test-pg.yml build
+        run: docker compose -f docker-compose.test-pg.yml build
       - name: Run bmo specific tests
-        run: docker-compose -f docker-compose.test-pg.yml run -e CI=1 bugzilla6.test test_bmo -q -f t/bmo/*.t
+        run: docker compose -f docker-compose.test-pg.yml run -e CI=1 bugzilla6.test test_bmo -q -f t/bmo/*.t
 
   test_bugzilla6_sqlite:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Install docker-compose
-        run: sudo apt update && sudo apt install -y docker-compose
+        run: sudo apt-get update && sudo apt-get install -y docker-compose
       - name: Build the Docker images
         run: docker compose -f docker-compose.test-sqlite.yml build
       - name: Run bmo specific tests

.github/workflows/release.yml

@@ -15,8 +15,8 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   ubuntu:
-    name: Release Tests on Ubuntu 20.04
-    runs-on: ubuntu-20.04
+    name: Release Tests on Ubuntu 24.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4
@@ -27,42 +27,46 @@ jobs:
             ~/.perl-cpm/cache
             ~/.perl-cpm/builds
             **/local/
-          key: ${{ runner.os }}-ubuntu-20.04
+          key: ${{ runner.os }}-ubuntu-24.04
           restore-keys: |
-            ${{ runner.os }}-ubuntu-20.04
+            ${{ runner.os }}-ubuntu-24.04
       - name: apt install
         run: |
           sudo apt-get update
           sudo apt-get -y dist-upgrade
           sudo apt-get install --ignore-hold --allow-downgrades -y \
            apache2 \
-           mariadb-client-10.3 \
-           netcat \
+           cpanminus \
+           mariadb-client \
+           netcat-traditional \
            build-essential \
            libapache2-mod-perl2 \
            libapache2-mod-perl2-dev \
+           libgd3 \
+           libgd-dev \
            perlmagick \
            graphviz \
            curl libssl-dev zlib1g-dev openssl \
            libexpat-dev cmake git libcairo-dev \
-           unzip wget 
-      - name: cpm install
+           unzip wget
+      - name: Run Makefile.PL
         run: |
           perl Makefile.PL
-          #make cpanfile GEN_CPANFILE_ARGS='-A'
-          perl -I$GITHUB_WORKSPACE/.github/cpm/lib/perl5 $GITHUB_WORKSPACE/.github/cpm/bin/cpm install \
-          && tar -C $GITHUB_WORKSPACE \
+          cpanm --notest --quiet --local-lib="$GITHUB_WORKSPACE/.github/cpm/lib/perl5" Module::CPANfile
+          make cpanfile GEN_CPANFILE_ARGS='-A -U oracle'
+      - name: cpm install
+        run: |
+          perl -I"$GITHUB_WORKSPACE/.github/cpm/lib/perl5" "$GITHUB_WORKSPACE/.github/cpm/bin/cpm" install \
+          && tar -C "$GITHUB_WORKSPACE" \
               --exclude 'local/cache/*' \
               --exclude 'local/man/*' \
               --exclude '*.pod' \
               -zcvf local-lib.tar.gz local
       - name: Save dependencies
         uses: actions/upload-artifact@v4
         with:
-          name: ubuntu-20.04-local-lib.tar.gz
+          name: ubuntu-24.04-local-lib.tar.gz
           path: local-lib.tar.gz
-      - name: Run Makefile.PL
-        run: 'perl Makefile.PL'
       - name: Run checksetup
         run: 'perl checksetup.pl --no-database --default-localconfig --no-templates'
       - name: Run tests

Dockerfile

@@ -1,5 +1,5 @@
-ARG BZDB="-mysql8"
-FROM bugzilla/bugzilla-perl-slim${BZDB}:20240419.1
+ARG BZDB="-mysql"
+FROM bugzilla/bugzilla-perl-slim${BZDB}:20250925.1
 
 ENV DEBIAN_FRONTEND noninteractive
 

Makefile.PL

@@ -90,6 +90,7 @@ my %requires = (
   'Role::Tiny'                 => '2.000003',
   'Scope::Guard'               => '0.21',
   'Sereal'                     => '4.004',
+  'Sub::Identify'              => 0,
   'Sub::Quote'                 => '2.005000',
   'Template'                   => '3.008',
   'Text::CSV_XS'               => '1.26',
@@ -199,7 +200,7 @@ my %optional_features = (
   jsonrpc => {
     description => 'JSON-RPC Interface',
     prereqs     => {
-      runtime => {requires => {'JSON::RPC' => '== 1.01', 'Test::Taint' => '1.06'}}
+      runtime => {requires => {'JSON::RPC' => '1.01', 'Test::Taint' => '1.06'}}
     }
   },
   linux_pdeath => {
@@ -283,7 +284,7 @@ my %optional_features = (
   rest => {
     description => 'REST Interface',
     prereqs     => {
-      runtime => {requires => {'Test::Taint' => '1.06', 'JSON::RPC' => '==1.01',}}
+      runtime => {requires => {'Test::Taint' => '1.06', 'JSON::RPC' => '1.01',}}
     }
   },
   s3 => {

cpanfile

@@ -68,6 +68,7 @@ requires 'Role::Tiny', '2.000003';
 requires 'SOAP::Lite', '0.712';
 requires 'Scope::Guard', '0.21';
 requires 'Sereal', '4.004';
+requires 'Sub::Identify';
 requires 'Sub::Quote', '2.005000';
 requires 'Sys::Syslog';
 requires 'Template', '3.008';

docker-compose.test-mariadb.yml

@@ -8,7 +8,7 @@ services:
   bugzilla6.test:
     build:
       args:
-        - BZDB=-mariadb106
+        - BZDB=-mariadb
       context: .
       dockerfile: Dockerfile
     command: dev_httpd

docker-compose.test-pg.yml

@@ -8,7 +8,7 @@ services:
   bugzilla6.test:
     build:
       args:
-        - BZDB=-pg9
+        - BZDB=-pg
       context: .
       dockerfile: Dockerfile
     command: dev_httpd
@@ -18,7 +18,7 @@ services:
     environment:
       - 'BMO_inbound_proxies=*'
       - BMO_db_driver=pg
-      - BMO_db_host=bugzilla6.pgsql9
+      - BMO_db_host=bugzilla6.pgsql13
       - BMO_db_name=bugs
       - BMO_db_pass=bugs
       - BMO_db_user=bugs
@@ -40,12 +40,12 @@ services:
       - TWD_HOST=selenium
       - TWD_PORT=4444
     depends_on:
-      - bugzilla6.pgsql9
+      - bugzilla6.pgsql13
       - memcached
       - selenium
 
-  bugzilla6.pgsql9:
-    image: postgres:9.0
+  bugzilla6.pgsql13:
+    image: postgres:13.22
     tmpfs:
       - /tmp
     logging:

docker-compose.test.yml

@@ -43,9 +43,9 @@ services:
       - selenium
 
   bugzilla6.mysql8:
-    build:
-      context: .
-      dockerfile: docker/images/Dockerfile.mysql8
+    image: mysql:8
+    command:
+      - '--max_allowed_packet=64M'
     tmpfs:
       - /tmp
     logging:

docker-compose.yml

@@ -95,9 +95,9 @@ services:
 #      - memcached
 
   bugzilla6.mysql8:
-    build:
-      context: .
-      dockerfile: docker/images/Dockerfile.mysql8
+    image: mysql:8
+    command:
+      - '--max_allowed_packet=64M'
     volumes:
       - bugzilla6-mysql-db:/var/lib/mysql
     tmpfs: