diff --git a/.cirrus.yml b/.cirrus.yml index a19c82c0e9..68eb92539e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -64,10 +64,10 @@ compute_credits_template: &CREDITS_TEMPLATE use_compute_credits: $CIRRUS_REPO_FULL_NAME == 'bitcoin/bitcoin' && $CIRRUS_PR != "" task: - name: 'lint [bionic]' + name: 'lint [jammy]' << : *BASE_TEMPLATE container: - image: ubuntu:bionic + image: ubuntu:jammy cpu: 1 memory: 1G # For faster CI feedback, immediately schedule the linters diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh index 7b3cf59652..201ede1fdd 100755 --- a/ci/lint/04_install.sh +++ b/ci/lint/04_install.sh @@ -27,14 +27,6 @@ export PATH="${PYTHON_PATH}/bin:${PATH}" command -v python3 python3 --version -( - # Temporary workaround for https://github.com/bitcoin/bitcoin/pull/26130#issuecomment-1260499544 - # Can be removed once the underlying image is bumped to something that includes git2.34 or later - sed -i -e 's/bionic/jammy/g' /etc/apt/sources.list - ${CI_RETRY_EXE} apt-get update - ${CI_RETRY_EXE} apt-get install -y --reinstall git -) - ${CI_RETRY_EXE} pip3 install codespell==2.2.1 ${CI_RETRY_EXE} pip3 install flake8==4.0.1 ${CI_RETRY_EXE} pip3 install mypy==0.942