Skip to content

Commit 8997f42

Browse files
committed
gh/cirrus: use newer ubuntu releases (22.04 and 24.04)
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent 6988ab4 commit 8997f42

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

.cirrus.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,21 @@ task:
122122
EXTRATEST_SOURCESH: y
123123
TESTSUITE_ENABLE_MODULECACHE: 1
124124
container:
125-
image: ubuntu:focal
125+
image: ubuntu:jammy
126126
cpu: 1
127127
memory: 2G
128128
reqinstall_script: |
129129
# restore manpages subsystem in container
130130
yes | unminimize || true
131131
# install requirements
132132
apt-get update
133-
apt-get -y install curl wget expect-dev dejagnu python3-sphinx gzip man-db bash tcsh ksh zsh fish tcl tcl8.6 perl python ruby cmake r-base-core
133+
apt-get -y install curl wget expect-dev dejagnu python3-sphinx gzip man-db bash tcsh ksh zsh fish tcl tcl8.6 perl python3 ruby cmake r-base-core
134134
# libtclenvmodules build requirements
135135
apt-get -y install gcc autoconf tcl8.6-dev
136136
# requirements for source-sh extra tests
137137
apt-get -y install lsof
138138
# install powershell
139-
curl -LJO https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
139+
curl -LJO https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
140140
dpkg -i packages-microsoft-prod.deb
141141
rm packages-microsoft-prod.deb
142142
apt-get update
@@ -154,7 +154,7 @@ task:
154154
LANG: C
155155
LC_ALL: C
156156
container:
157-
image: ubuntu:jammy
157+
image: ubuntu:noble
158158
cpu: 1
159159
memory: 2G
160160
reqinstall_script: |
@@ -168,7 +168,7 @@ task:
168168
# requirements for source-sh extra tests
169169
apt-get -y install lsof
170170
# install powershell
171-
curl -LJO https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
171+
curl -LJO https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb
172172
dpkg -i packages-microsoft-prod.deb
173173
rm packages-microsoft-prod.deb
174174
apt-get update

.github/workflows/lint_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
lint-all:
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- uses: actions/checkout@v4
1515
with:

.github/workflows/linux_tests.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
tcl86-nolibtclenvmodules:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
env:
1414
CONFIGURE_OPTS: --with-tclsh=tclsh8.6 --disable-libtclenvmodules --prefix=/tmp/modules --with-pager=more --with-pager-opts=-X --with-initconf-in=initdir --enable-quarantine-support --disable-set-binpath --disable-set-manpath
1515
COVERAGE: y
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install system packages
2323
run: |
2424
# add microsoft repository for powershell
25-
curl -LJO https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
25+
curl -LJO https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
2626
sudo dpkg -i packages-microsoft-prod.deb
2727
rm packages-microsoft-prod.deb
2828
sudo apt-get -y update
@@ -66,7 +66,7 @@ jobs:
6666
retention-days: 5
6767

6868
tcl85-nolibtclenvmodules:
69-
runs-on: ubuntu-20.04
69+
runs-on: ubuntu-22.04
7070
env:
7171
CONFIGURE_OPTS: --with-tclsh=tclsh8.5 --prefix=/tmp/modules --disable-libtclenvmodules --with-tcl=/usr/local/lib --enable-versioning --with-loadedmodules=null:dot --without-pager --disable-avail-indepth --with-terminal-background=light --with-unload-match-order=returnfirst --disable-implicit-default --with-search-match=contains --with-locked-configs=extra_siteconfig --disable-auto-handling --disable-extended-default --disable-advanced-version-spec --disable-color --with-icase=never --with-tcl-linter=nagelfar135/nagelfar.tcl
7272
COVERAGE: y
@@ -79,7 +79,7 @@ jobs:
7979
- name: Install system packages
8080
run: |
8181
# add microsoft repository for powershell
82-
curl -LJO https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
82+
curl -LJO https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
8383
sudo dpkg -i packages-microsoft-prod.deb
8484
rm packages-microsoft-prod.deb
8585
sudo apt-get -y update
@@ -130,7 +130,7 @@ jobs:
130130
retention-days: 5
131131

132132
tcl85-2:
133-
runs-on: ubuntu-20.04
133+
runs-on: ubuntu-22.04
134134
env:
135135
CONFIGURE_OPTS: --with-tclsh=tclsh8.5 --prefix=/tmp/modules --with-tcl=/usr/local/lib --enable-quarantine-support --enable-silent-shell-debug-support --enable-modulespath --with-pager=more --with-dark-background-colors=hi --with-locked-configs=implicit_default --enable-wa-277 --enable-advanced-version-spec --disable-ml --disable-implicit-requirement --enable-set-shell-startup
136136
COVERAGE: y
@@ -143,7 +143,7 @@ jobs:
143143
- name: Install system packages
144144
run: |
145145
# add microsoft repository for powershell
146-
curl -LJO https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
146+
curl -LJO https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
147147
sudo dpkg -i packages-microsoft-prod.deb
148148
rm packages-microsoft-prod.deb
149149
sudo apt-get -y update
@@ -194,7 +194,7 @@ jobs:
194194
retention-days: 5
195195

196196
tcl86:
197-
runs-on: ubuntu-20.04
197+
runs-on: ubuntu-22.04
198198
env:
199199
CONFIGURE_OPTS: --with-tclsh=tclsh8.6 --prefix=/tmp/modules --libdir=/tmp/modules/lib64 --enable-multilib-support --enable-new-features
200200
COVERAGE: y
@@ -210,7 +210,7 @@ jobs:
210210
- name: Install system packages
211211
run: |
212212
# add microsoft repository for powershell
213-
curl -LJO https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
213+
curl -LJO https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
214214
sudo dpkg -i packages-microsoft-prod.deb
215215
rm packages-microsoft-prod.deb
216216
sudo apt-get -y update
@@ -256,7 +256,7 @@ jobs:
256256
retention-days: 5
257257

258258
tcl85:
259-
runs-on: ubuntu-20.04
259+
runs-on: ubuntu-22.04
260260
env:
261261
CONFIGURE_OPTS: --with-tclsh=tclsh8.5 --prefix=/tmp/modules --with-tcl=/usr/local/lib
262262
COVERAGE: y
@@ -269,7 +269,7 @@ jobs:
269269
- name: Install system packages
270270
run: |
271271
# add microsoft repository for powershell
272-
curl -LJO https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
272+
curl -LJO https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
273273
sudo dpkg -i packages-microsoft-prod.deb
274274
rm packages-microsoft-prod.deb
275275
sudo apt-get -y update

0 commit comments

Comments
 (0)