Skip to content

Commit b4d74af

Browse files
authored
[harmony] Bug 1963965: Update test runner to Ubuntu 24.04 (#148)
1 parent 5420601 commit b4d74af

File tree

2 files changed

+27
-23
lines changed

2 files changed

+27
-23
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: Install docker-compose
21-
run: sudo apt update && sudo apt install -y docker-compose
21+
run: sudo apt-get update && sudo apt-get install -y docker-compose
2222
- name: Build the Docker images
2323
run: docker compose -f docker-compose.test.yml build
2424
- name: Run sanity tests
@@ -29,7 +29,7 @@ jobs:
2929
# steps:
3030
# - uses: actions/checkout@v4
3131
# - name: Install docker-compose
32-
# run: sudo apt update && sudo apt install -y docker-compose
32+
# run: sudo apt-get update && sudo apt-get install -y docker-compose
3333
# - name: Build the Docker images
3434
# run: docker compose -f docker-compose.test.yml build
3535
# - name: Run webservice tests
@@ -40,7 +40,7 @@ jobs:
4040
steps:
4141
- uses: actions/checkout@v4
4242
- name: Install docker-compose
43-
run: sudo apt update && sudo apt install -y docker-compose
43+
run: sudo apt-get update && sudo apt-get install -y docker-compose
4444
- name: Build the Docker images
4545
run: docker compose -f docker-compose.test.yml build
4646
- name: Run bmo specific tests
@@ -51,29 +51,29 @@ jobs:
5151
steps:
5252
- uses: actions/checkout@v4
5353
- name: Install docker-compose
54-
run: sudo apt update && sudo apt install -y docker-compose
54+
run: sudo apt-get update && sudo apt-get install -y docker-compose
5555
- name: Build the Docker images
5656
run: docker compose -f docker-compose.test-mariadb.yml build
5757
- name: Run bmo specific tests
5858
run: docker compose -f docker-compose.test-mariadb.yml run -e CI=1 bugzilla6.test test_bmo -q -f t/bmo/*.t
5959

6060
test_bugzilla6_pg:
61-
runs-on: ubuntu-20.04
61+
runs-on: ubuntu-latest
6262
steps:
6363
- uses: actions/checkout@v4
6464
- name: Install docker-compose
65-
run: sudo apt update && sudo apt install -y docker-compose docker.io
65+
run: sudo apt-get update && sudo apt-get install -y docker-compose
6666
- name: Build the Docker images
67-
run: docker-compose -f docker-compose.test-pg.yml build
67+
run: docker compose -f docker-compose.test-pg.yml build
6868
- name: Run bmo specific tests
69-
run: docker-compose -f docker-compose.test-pg.yml run -e CI=1 bugzilla6.test test_bmo -q -f t/bmo/*.t
69+
run: docker compose -f docker-compose.test-pg.yml run -e CI=1 bugzilla6.test test_bmo -q -f t/bmo/*.t
7070

7171
test_bugzilla6_sqlite:
7272
runs-on: ubuntu-latest
7373
steps:
7474
- uses: actions/checkout@v4
7575
- name: Install docker-compose
76-
run: sudo apt update && sudo apt install -y docker-compose
76+
run: sudo apt-get update && sudo apt-get install -y docker-compose
7777
- name: Build the Docker images
7878
run: docker compose -f docker-compose.test-sqlite.yml build
7979
- name: Run bmo specific tests

.github/workflows/release.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ on:
1515
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1616
jobs:
1717
ubuntu:
18-
name: Release Tests on Ubuntu 20.04
19-
runs-on: ubuntu-20.04
18+
name: Release Tests on Ubuntu 24.04
19+
runs-on: ubuntu-24.04
2020
steps:
2121
- name: Checkout the repository
2222
uses: actions/checkout@v4
@@ -27,42 +27,46 @@ jobs:
2727
~/.perl-cpm/cache
2828
~/.perl-cpm/builds
2929
**/local/
30-
key: ${{ runner.os }}-ubuntu-20.04
30+
key: ${{ runner.os }}-ubuntu-24.04
3131
restore-keys: |
32-
${{ runner.os }}-ubuntu-20.04
32+
${{ runner.os }}-ubuntu-24.04
3333
- name: apt install
3434
run: |
3535
sudo apt-get update
3636
sudo apt-get -y dist-upgrade
3737
sudo apt-get install --ignore-hold --allow-downgrades -y \
3838
apache2 \
39-
mariadb-client-10.3 \
40-
netcat \
39+
cpanminus \
40+
mariadb-client \
41+
netcat-traditional \
4142
build-essential \
4243
libapache2-mod-perl2 \
4344
libapache2-mod-perl2-dev \
45+
libgd3 \
46+
libgd-dev \
4447
perlmagick \
4548
graphviz \
4649
curl libssl-dev zlib1g-dev openssl \
4750
libexpat-dev cmake git libcairo-dev \
48-
unzip wget
49-
- name: cpm install
51+
unzip wget
52+
- name: Run Makefile.PL
5053
run: |
5154
perl Makefile.PL
52-
#make cpanfile GEN_CPANFILE_ARGS='-A'
53-
perl -I$GITHUB_WORKSPACE/.github/cpm/lib/perl5 $GITHUB_WORKSPACE/.github/cpm/bin/cpm install \
54-
&& tar -C $GITHUB_WORKSPACE \
55+
cpanm --notest --quiet --local-lib="$GITHUB_WORKSPACE/.github/cpm/lib/perl5" Module::CPANfile
56+
make cpanfile GEN_CPANFILE_ARGS='-A -U oracle'
57+
- name: cpm install
58+
run: |
59+
perl -I"$GITHUB_WORKSPACE/.github/cpm/lib/perl5" "$GITHUB_WORKSPACE/.github/cpm/bin/cpm" install \
60+
&& tar -C "$GITHUB_WORKSPACE" \
5561
--exclude 'local/cache/*' \
5662
--exclude 'local/man/*' \
5763
--exclude '*.pod' \
5864
-zcvf local-lib.tar.gz local
5965
- name: Save dependencies
6066
uses: actions/upload-artifact@v4
6167
with:
62-
name: ubuntu-20.04-local-lib.tar.gz
68+
name: ubuntu-24.04-local-lib.tar.gz
6369
path: local-lib.tar.gz
64-
- name: Run Makefile.PL
65-
run: 'perl Makefile.PL'
6670
- name: Run checksetup
6771
run: 'perl checksetup.pl --no-database --default-localconfig --no-templates'
6872
- name: Run tests

0 commit comments

Comments
 (0)