From 2f40efd9de2bd350844dd7fbbc4d873f1670f51e Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Tue, 23 Sep 2025 01:26:53 -0400 Subject: [PATCH 1/8] Bug 1963965: Update test runner to Ubuntu 24.04 --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e38b9864b..696662985 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 20159bc04..9887c0837 100644 --- a/.github/workflows/release.yml +++ b/.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 @@ -36,8 +36,8 @@ jobs: sudo apt-get -y dist-upgrade sudo apt-get install --ignore-hold --allow-downgrades -y \ apache2 \ - mariadb-client-10.3 \ - netcat \ + mariadb-client \ + netcat-traditional \ build-essential \ libapache2-mod-perl2 \ libapache2-mod-perl2-dev \ @@ -45,7 +45,7 @@ jobs: graphviz \ curl libssl-dev zlib1g-dev openssl \ libexpat-dev cmake git libcairo-dev \ - unzip wget + unzip wget - name: cpm install run: | perl Makefile.PL From 95393312041b9dce214ac7d1030f0bc8044c8665 Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Thu, 25 Sep 2025 00:22:55 -0400 Subject: [PATCH 2/8] fix more 20.04 references --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9887c0837..ba5908a46 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,9 +27,9 @@ 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 @@ -59,7 +59,7 @@ jobs: - 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' From 80c9fcf1c03c0a347c9373e3fdc35b438d447326 Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Thu, 25 Sep 2025 19:32:12 -0400 Subject: [PATCH 3/8] try regenerating the cpanfile --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba5908a46..e74a740fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,7 +49,7 @@ jobs: - name: cpm install run: | perl Makefile.PL - #make cpanfile GEN_CPANFILE_ARGS='-A' + 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 \ --exclude 'local/cache/*' \ From b55c7f9dd028e7335ac9d67681426653d364109c Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Thu, 25 Sep 2025 19:40:32 -0400 Subject: [PATCH 4/8] add missing make prereqs --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e74a740fa..687dacbde 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,6 +36,7 @@ jobs: sudo apt-get -y dist-upgrade sudo apt-get install --ignore-hold --allow-downgrades -y \ apache2 \ + cpanminus \ mariadb-client \ netcat-traditional \ build-essential \ @@ -49,6 +50,7 @@ jobs: - name: cpm install run: | perl Makefile.PL + cpanm --notest --quiet Module::CPANfile 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 \ From a09865c3f5b0f67d431f6dd8ea47392567289fd6 Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Thu, 25 Sep 2025 19:50:12 -0400 Subject: [PATCH 5/8] do not build oracle, add GD deps --- .github/workflows/release.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 687dacbde..7cb6908aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,6 +42,8 @@ jobs: build-essential \ libapache2-mod-perl2 \ libapache2-mod-perl2-dev \ + libgd3 \ + libgd-dev \ perlmagick \ graphviz \ curl libssl-dev zlib1g-dev openssl \ @@ -50,10 +52,10 @@ jobs: - name: cpm install run: | perl Makefile.PL - cpanm --notest --quiet Module::CPANfile - 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 -X oracle' + 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' \ From 4888cd74eb03b6dbec6760c11036e47758958f9f Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Thu, 25 Sep 2025 19:59:42 -0400 Subject: [PATCH 6/8] the correct way to not build oracle --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7cb6908aa..31aa43d10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,7 @@ jobs: run: | perl Makefile.PL cpanm --notest --quiet --local-lib="$GITHUB_WORKSPACE/.github/cpm/lib/perl5" Module::CPANfile - make cpanfile GEN_CPANFILE_ARGS='-A -X oracle' + make cpanfile GEN_CPANFILE_ARGS='-A -U oracle' perl -I"$GITHUB_WORKSPACE/.github/cpm/lib/perl5" "$GITHUB_WORKSPACE/.github/cpm/bin/cpm" install \ && tar -C "$GITHUB_WORKSPACE" \ --exclude 'local/cache/*' \ From e5bb2c9b2fc9e5b6f0ba0451a21a8f830fe4fcc8 Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Thu, 25 Sep 2025 20:16:42 -0400 Subject: [PATCH 7/8] put jobs in sane order, remove redundancies --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 31aa43d10..97a8af1d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,11 +49,13 @@ jobs: curl libssl-dev zlib1g-dev openssl \ libexpat-dev cmake git libcairo-dev \ unzip wget - - name: cpm install + - name: Run Makefile.PL run: | perl Makefile.PL 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/*' \ @@ -65,8 +67,6 @@ jobs: with: 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 From ea66bc922b9538562fda8ae46d9a5a54fbdd1008 Mon Sep 17 00:00:00 2001 From: Dave Miller Date: Thu, 25 Sep 2025 20:41:54 -0400 Subject: [PATCH 8/8] fix pg test build? --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 696662985..b3fa4fe03 100644 --- a/.github/workflows/ci.yml +++ b/.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,7 +51,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-mariadb.yml build - name: Run bmo specific tests @@ -62,18 +62,18 @@ jobs: 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