Skip to content

Commit 123043e

Browse files
committed
ci: Bump lint task image to Ubuntu Jammy
1 parent 9b86114 commit 123043e

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ compute_credits_template: &CREDITS_TEMPLATE
6464
use_compute_credits: $CIRRUS_REPO_FULL_NAME == 'bitcoin/bitcoin' && $CIRRUS_PR != ""
6565

6666
task:
67-
name: 'lint [bionic]'
67+
name: 'lint [jammy]'
6868
<< : *BASE_TEMPLATE
6969
container:
70-
image: ubuntu:bionic
70+
image: ubuntu:jammy
7171
cpu: 1
7272
memory: 1G
7373
# For faster CI feedback, immediately schedule the linters

ci/lint/04_install.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@ export PATH="${PYTHON_PATH}/bin:${PATH}"
2727
command -v python3
2828
python3 --version
2929

30-
(
31-
# Temporary workaround for https://github.com/bitcoin/bitcoin/pull/26130#issuecomment-1260499544
32-
# Can be removed once the underlying image is bumped to something that includes git2.34 or later
33-
sed -i -e 's/bionic/jammy/g' /etc/apt/sources.list
34-
${CI_RETRY_EXE} apt-get update
35-
${CI_RETRY_EXE} apt-get install -y --reinstall git
36-
)
37-
3830
${CI_RETRY_EXE} pip3 install codespell==2.2.1
3931
${CI_RETRY_EXE} pip3 install flake8==4.0.1
4032
${CI_RETRY_EXE} pip3 install mypy==0.942

0 commit comments

Comments
 (0)