diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2023-01-16 13:30:00 +0000 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2023-01-16 13:30:00 +0000 |
| commit | 123043e99cf3aab9eef7e381b133477b518ac4d0 (patch) | |
| tree | 1929251872be740a8b89dec55657190b30f287aa | |
| parent | 9b86114058b3931c5b4ddc931a8a2cfdc8b085b6 (diff) | |
| download | bitcoin-123043e99cf3aab9eef7e381b133477b518ac4d0.tar.xz | |
ci: Bump lint task image to Ubuntu Jammy
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rwxr-xr-x | ci/lint/04_install.sh | 8 |
2 files changed, 2 insertions, 10 deletions
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 |