Skip to content

Commit 56bd1c9

Browse files
committed
Update CI base for 2.9 branch to Ubuntu 24.04.
1 parent 130da52 commit 56bd1c9

2 files changed

Lines changed: 3 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
jobs:
1414

1515
rip-and-test:
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-24.04
1717
steps:
1818
- name: Dump GitHub context
1919
env:
@@ -29,8 +29,6 @@ jobs:
2929
set -x
3030
sudo apt-get install -y eatmydata
3131
eatmydata ./scripts/travis-install-build-deps.sh
32-
eatmydata curl -L -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
33-
sudo eatmydata apt install ./po4a_0.67-2_all.deb
3432
cd src
3533
eatmydata ./autogen.sh
3634
eatmydata ./configure --with-realtime=uspace --disable-check-runtime-deps
@@ -39,7 +37,7 @@ jobs:
3937
eatmydata ../scripts/rip-environment runtests -p
4038
4139
rip-and-test-clang:
42-
runs-on: ubuntu-20.04
40+
runs-on: ubuntu-24.04
4341
steps:
4442
- name: Dump GitHub context
4543
env:
@@ -56,8 +54,6 @@ jobs:
5654
sudo apt-get install -y eatmydata
5755
eatmydata ./scripts/travis-install-build-deps.sh
5856
sudo eatmydata apt-get install -y clang
59-
eatmydata curl -L -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
60-
sudo eatmydata apt install ./po4a_0.67-2_all.deb
6157
cd src
6258
eatmydata ./autogen.sh
6359
CC=clang CXX=clang++ eatmydata ./configure --with-realtime=uspace --disable-check-runtime-deps
@@ -66,7 +62,7 @@ jobs:
6662
eatmydata ../scripts/rip-environment runtests -p
6763
6864
htmldocs:
69-
runs-on: ubuntu-20.04
65+
runs-on: ubuntu-24.04
7066
steps:
7167
- name: Dump GitHub context
7268
env:
@@ -81,8 +77,6 @@ jobs:
8177
run: |
8278
./scripts/travis-install-build-deps.sh
8379
sudo apt-get install -y eatmydata
84-
curl -L -O https://snapshot.debian.org/archive/debian/20220716T154603Z/pool/main/p/po4a/po4a_0.67-2_all.deb
85-
sudo apt install ./po4a_0.67-2_all.deb
8680
cd src
8781
eatmydata ./autogen.sh
8882
eatmydata ./configure --with-realtime=uspace --disable-check-runtime-deps --enable-build-documentation=html

scripts/travis-install-build-deps.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#!/bin/sh -ex
2-
sudo sh -c 'echo deb-src http://us.archive.ubuntu.com/ubuntu/ xenial main universe >> /etc/apt/sources.list'
3-
grep . /etc/apt/sources.list /etc/apt/sources.list.d/* || true
42
sudo apt-get update -qq
53
sudo apt-get install -y devscripts equivs build-essential --no-install-recommends
64
sudo apt-get remove -f libreadline6-dev || true

0 commit comments

Comments
 (0)