Skip to content

Commit 01ec530

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#26716: ci: Build python from source in "lint" task
123043e ci: Bump lint task image to Ubuntu Jammy (Hennadii Stepanov) 9b86114 ci: Use pyenv's `python-build` to install Python in lint task (Hennadii Stepanov) Pull request description: This PR: - is an alternative to bitcoin/bitcoin#26581 and bitcoin/bitcoin#26637 - closes bitcoin/bitcoin#26548 Key advantages of this PR over others: - it uses pyenv's `python-build` [standalone](https://github.com/pyenv/pyenv/tree/master/plugins/python-build#using-python-build-standalone) - requires no additional computational resources Note for testing. The lint task must success regardless of whether the `python_cache` is populated or invalidated. ACKs for top commit: MarcoFalke: ACK 123043e fanquake: ACK 123043e Tree-SHA512: ba0fcdd4f2939a59692b173dcd1f5704444cfcfbb8111538c6f8160056d0536bba250e4f9b0f8c66f8b454e52034bf36ffe6afae76cdc0f7cc5b58b576d790ba
2 parents 89fb354 + 123043e commit 01ec530

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

.cirrus.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,17 @@ compute_credits_template: &CREDITS_TEMPLATE
6565
use_compute_credits: $CIRRUS_REPO_FULL_NAME == 'bitcoin/bitcoin' && $CIRRUS_PR != ""
6666

6767
task:
68-
name: 'lint [bionic]'
68+
name: 'lint [jammy]'
6969
<< : *BASE_TEMPLATE
7070
container:
71-
image: ubuntu:bionic # For python 3.6, oldest supported version according to doc/dependencies.md
71+
image: ubuntu:jammy
7272
cpu: 1
7373
memory: 1G
7474
# For faster CI feedback, immediately schedule the linters
7575
<< : *CREDITS_TEMPLATE
76+
python_cache:
77+
folder: "/tmp/python"
78+
fingerprint_script: cat .python-version /etc/os-release
7679
lint_script:
7780
- ./ci/lint_run_all.sh
7881
env:

ci/lint/04_install.sh

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,25 @@
77
export LC_ALL=C
88

99
${CI_RETRY_EXE} apt-get update
10-
${CI_RETRY_EXE} apt-get install -y python3-pip curl git gawk jq
11-
(
12-
# Temporary workaround for https://github.com/bitcoin/bitcoin/pull/26130#issuecomment-1260499544
13-
# Can be removed once the underlying image is bumped to something that includes git2.34 or later
14-
sed -i -e 's/bionic/jammy/g' /etc/apt/sources.list
15-
${CI_RETRY_EXE} apt-get update
16-
${CI_RETRY_EXE} apt-get install -y --reinstall git
17-
)
10+
${CI_RETRY_EXE} apt-get install -y curl git gawk jq xz-utils
11+
12+
PYTHON_PATH=/tmp/python
13+
if [ ! -d "${PYTHON_PATH}/bin" ]; then
14+
(
15+
git clone https://github.com/pyenv/pyenv.git
16+
cd pyenv/plugins/python-build || exit 1
17+
./install.sh
18+
)
19+
# For dependencies see https://github.com/pyenv/pyenv/wiki#suggested-build-environment
20+
${CI_RETRY_EXE} apt-get install -y build-essential libssl-dev zlib1g-dev \
21+
libbz2-dev libreadline-dev libsqlite3-dev curl llvm \
22+
libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \
23+
clang
24+
env CC=clang python-build "$(cat "${BASE_ROOT_DIR}/.python-version")" "${PYTHON_PATH}"
25+
fi
26+
export PATH="${PYTHON_PATH}/bin:${PATH}"
27+
command -v python3
28+
python3 --version
1829

1930
${CI_RETRY_EXE} pip3 install codespell==2.2.1
2031
${CI_RETRY_EXE} pip3 install flake8==5.0.4

0 commit comments

Comments
 (0)