From 204e971de6cca36faa8b8b5a458c686d06e0f0bc Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 11 Aug 2023 22:29:14 -0400 Subject: [PATCH 1/2] ci: Use new name for WQY-ZenHei font package --- .github/workflows/tests.yml | 8 ++++---- azure-pipelines.yml | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2a67c7ffcbfb..a8514e22530d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -102,7 +102,9 @@ jobs: cm-super \ dvipng \ ffmpeg \ + fonts-freefont-otf \ fonts-noto-cjk \ + fonts-wqy-zenhei \ gdb \ gir1.2-gtk-3.0 \ graphviz \ @@ -123,8 +125,6 @@ jobs: libxcb-render-util0 \ libxcb-xinerama0 \ lmodern \ - fonts-freefont-otf \ - texlive-pictures \ pkg-config \ qtbase5-dev \ texlive-fonts-recommended \ @@ -132,8 +132,8 @@ jobs: texlive-latex-extra \ texlive-latex-recommended \ texlive-luatex \ - texlive-xetex \ - ttf-wqy-zenhei + texlive-pictures \ + texlive-xetex if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then sudo apt-get install -yy libopengl0 else # ubuntu-22.04 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bb38804ae121..027923cdc3e9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -97,6 +97,7 @@ stages: dvipng \ ffmpeg \ fonts-noto-cjk \ + fonts-wqy-zenhei \ gdb \ gir1.2-gtk-3.0 \ graphviz \ @@ -111,8 +112,8 @@ stages: texlive-latex-base \ texlive-latex-extra \ texlive-latex-recommended \ - texlive-xetex texlive-luatex \ - ttf-wqy-zenhei + texlive-luatex \ + texlive-xetex ;; darwin) brew install --cask xquartz From c774216be27350aef5b6b28ec7ade0b09915a9bb Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 11 Aug 2023 22:32:26 -0400 Subject: [PATCH 2/2] ci: Don't install recommended packages on Ubuntu We don't need the optional packages and save a little download/install time. --- .github/workflows/tests.yml | 13 +++++++------ azure-pipelines.yml | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a8514e22530d..2314f65225a9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -97,7 +97,7 @@ jobs: Linux) echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries sudo apt-get update -yy - sudo apt-get install -yy \ + sudo apt-get install -yy --no-install-recommends \ ccache \ cm-super \ dvipng \ @@ -135,9 +135,10 @@ jobs: texlive-pictures \ texlive-xetex if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then - sudo apt-get install -yy libopengl0 + sudo apt-get install -yy --no-install-recommends libopengl0 else # ubuntu-22.04 - sudo apt-get install -yy gir1.2-gtk-4.0 libnotify4 + sudo apt-get install -yy --no-install-recommends \ + gir1.2-gtk-4.0 libnotify4 fi ;; macOS) @@ -178,10 +179,10 @@ jobs: ~/.cache/matplotlib !~/.cache/matplotlib/tex.cache !~/.cache/matplotlib/test_cache - key: 3-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }} + key: 4-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-${{ github.sha }} restore-keys: | - 3-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}- - 3-${{ runner.os }}-py${{ matrix.python-version }}-mpl- + 4-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}- + 4-${{ runner.os }}-py${{ matrix.python-version }}-mpl- - name: Install Python dependencies run: | diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 027923cdc3e9..7d00e499fd18 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -92,7 +92,7 @@ stages: linux) echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries sudo apt update - sudo apt install \ + sudo apt install --no-install-recommends \ cm-super \ dvipng \ ffmpeg \ pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy