Skip to content

Commit 0ac170b

Browse files
authored
Merge pull request matplotlib#26505 from QuLogic/gha-update
ci: Don't install recommended packages on Ubuntu
2 parents 41505e2 + c774216 commit 0ac170b

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

.github/workflows/tests.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,14 @@ jobs:
9797
Linux)
9898
echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries
9999
sudo apt-get update -yy
100-
sudo apt-get install -yy \
100+
sudo apt-get install -yy --no-install-recommends \
101101
ccache \
102102
cm-super \
103103
dvipng \
104104
ffmpeg \
105+
fonts-freefont-otf \
105106
fonts-noto-cjk \
107+
fonts-wqy-zenhei \
106108
gdb \
107109
gir1.2-gtk-3.0 \
108110
graphviz \
@@ -123,21 +125,20 @@ jobs:
123125
libxcb-render-util0 \
124126
libxcb-xinerama0 \
125127
lmodern \
126-
fonts-freefont-otf \
127-
texlive-pictures \
128128
pkg-config \
129129
qtbase5-dev \
130130
texlive-fonts-recommended \
131131
texlive-latex-base \
132132
texlive-latex-extra \
133133
texlive-latex-recommended \
134134
texlive-luatex \
135-
texlive-xetex \
136-
ttf-wqy-zenhei
135+
texlive-pictures \
136+
texlive-xetex
137137
if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
138-
sudo apt-get install -yy libopengl0
138+
sudo apt-get install -yy --no-install-recommends libopengl0
139139
else # ubuntu-22.04
140-
sudo apt-get install -yy gir1.2-gtk-4.0 libnotify4
140+
sudo apt-get install -yy --no-install-recommends \
141+
gir1.2-gtk-4.0 libnotify4
141142
fi
142143
;;
143144
macOS)
@@ -178,10 +179,10 @@ jobs:
178179
~/.cache/matplotlib
179180
!~/.cache/matplotlib/tex.cache
180181
!~/.cache/matplotlib/test_cache
181-
key: 3-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
182+
key: 4-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }}
182183
restore-keys: |
183-
3-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
184-
3-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
184+
4-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
185+
4-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
185186
186187
- name: Install Python dependencies
187188
run: |

azure-pipelines.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,12 @@ stages:
9292
linux)
9393
echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries
9494
sudo apt update
95-
sudo apt install \
95+
sudo apt install --no-install-recommends \
9696
cm-super \
9797
dvipng \
9898
ffmpeg \
9999
fonts-noto-cjk \
100+
fonts-wqy-zenhei \
100101
gdb \
101102
gir1.2-gtk-3.0 \
102103
graphviz \
@@ -111,8 +112,8 @@ stages:
111112
texlive-latex-base \
112113
texlive-latex-extra \
113114
texlive-latex-recommended \
114-
texlive-xetex texlive-luatex \
115-
ttf-wqy-zenhei
115+
texlive-luatex \
116+
texlive-xetex
116117
;;
117118
darwin)
118119
brew install --cask xquartz

0 commit comments

Comments
 (0)