fix: correct dependencies in package builds (1.11) (#24670) (#24675)

* chore: update ubuntu to 2204:current

* fix: install asciidoc with pip

(cherry picked from commit 70acbd58a8)
gw-master-1.x-24033
Geoffrey Wossum 2024-02-16 17:09:24 -06:00 committed by GitHub
parent 99a2261b9f
commit ad7774df3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 5 deletions

View File

@ -111,7 +111,7 @@ jobs:
machine:
enabled: true
docker_layer_caching: true
image: ubuntu-2004:202107-02
image: ubuntu-2204:current
steps:
- attach_workspace:
at: /tmp/workspace
@ -120,7 +120,6 @@ jobs:
export DEBIAN_FRONTEND=noninteractive
sudo -E apt-get update
sudo -E apt-get install --no-install-recommends --yes \
asciidoc \
build-essential \
git \
python3 \
@ -130,10 +129,12 @@ jobs:
sudo gem install fpm
( cd man ; make build ; gzip -9 ./*.1 )
python3 -m venv venv ; source venv/bin/activate
python3 -m pip install -r .circleci/scripts/package/requirements.txt
( cd man ; make build ; gzip -9 ./*.1 )
# Unfortunately, this must be executed as root. This is so permission
# modifying commands (chown, chmod, etc.) succeed.
sudo --preserve-env=CIRCLE_TAG,CIRCLE_SHA1 .circleci/scripts/package/build.py

View File

@ -1,2 +1,9 @@
PyYAML==6.0
regex==2023.6.3
asciidoc==10.2.0
distlib==0.3.8
filelock==3.13.1
nose==1.3.7
pep8==1.7.1
platformdirs==4.2.0
PyYAML==6.0.1
regex==2023.12.25
virtualenv==20.25.0