Skip to content

Commit 87014f4

Browse files
gh-145351: use --no-install-recommends (#145352)
(cherry picked from commit 9768085)
1 parent 4152bbb commit 87014f4

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Install dependencies
6565
run: |
6666
sudo ./.github/workflows/posix-deps-apt.sh
67-
sudo apt-get install -yq abigail-tools
67+
sudo apt-get install -yq --no-install-recommends abigail-tools
6868
- name: Build CPython
6969
env:
7070
CFLAGS: -g3 -O0

.github/workflows/posix-deps-apt.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
apt-get update
33

4-
apt-get -yq install \
4+
apt-get -yq --no-install-recommends install \
55
build-essential \
66
pkg-config \
77
ccache \
@@ -25,3 +25,13 @@ apt-get -yq install \
2525
uuid-dev \
2626
xvfb \
2727
zlib1g-dev
28+
<<<<<<< HEAD
29+
=======
30+
31+
# Workaround missing libmpdec-dev on ubuntu 24.04:
32+
# https://launchpad.net/~ondrej/+archive/ubuntu/php
33+
# https://deb.sury.org/
34+
sudo add-apt-repository ppa:ondrej/php
35+
apt-get update
36+
apt-get -yq --no-install-recommends install libmpdec-dev
37+
>>>>>>> 976808505a1 (gh-145351: use `--no-install-recommends` (#145352))

.github/workflows/regen-abidump.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set -ex
22

33
export DEBIAN_FRONTEND=noninteractive
44
./.github/workflows/posix-deps-apt.sh
5-
apt-get install -yq abigail-tools python3
5+
apt-get install -yq --no-install-recommends abigail-tools python3
66
export CFLAGS="-g3 -O0"
77
./configure --enable-shared && make
88
make regen-abidump

.github/workflows/reusable-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
restore-keys: |
9393
ubuntu-doc-
9494
- name: 'Install Dependencies'
95-
run: sudo ./.github/workflows/posix-deps-apt.sh && sudo apt-get install wamerican
95+
run: sudo ./.github/workflows/posix-deps-apt.sh && sudo apt-get install --no-install-recommends wamerican
9696
- name: 'Configure CPython'
9797
run: ./configure --with-pydebug
9898
- name: 'Build CPython'

.github/workflows/reusable-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: ${{ fromJSON(inputs.bolt-optimizations) }}
4343
run: |
4444
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 19
45-
sudo apt-get install bolt-19
45+
sudo apt-get install --no-install-recommends bolt-19
4646
echo PATH="$(llvm-config-19 --bindir):$PATH" >> $GITHUB_ENV
4747
- name: Configure OpenSSL env vars
4848
run: |

0 commit comments

Comments
 (0)