Merge pull request #16848 from QuLogic/update-ci

timhoffm · web-flow · commit 537a8c905e82 · 2020-03-20T10:26:15.000+01:00
Cleanup CI setup
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,8 +11,8 @@ version: 2.1
 apt-run:  &apt-install
   name: Install apt packages
   command: |
-    sudo apt-get -qq update
-    sudo apt-get install -y \
+    sudo apt -qq update
+    sudo apt install -y \
       inkscape \
       ffmpeg \
       dvipng \
@@ -25,35 +25,22 @@ apt-run:  &apt-install
       texlive-pictures \
       texlive-xetex \
       graphviz \
-      libgeos-dev \
       fonts-crosextra-carlito \
-      fonts-freefont-otf
+      fonts-freefont-otf \
+      fonts-humor-sans
 
 fonts-run:  &fonts-install
   name: Install custom fonts
-  # We manually install Humor-Sans using the package from Ubuntu 14.10.
-  # Unfortunately humor sans is not available in the Ubuntu version used by
-  # CircleCI but we can manually install the deb from a later version since
-  # it is basically just a .ttf file.
   command: |
     mkdir -p ~/.local/share/fonts
     wget -nc https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O ~/.local/share/fonts/Felipa-Regular.ttf || true
-    if [ ! -f ~/.local/share/fonts/Humor-Sans.ttf ]; then
-      wget http://http.us.debian.org/debian/pool/main/f/fonts-humor-sans/fonts-humor-sans_1.0-3_all.deb
-      mkdir tmp
-      dpkg -x fonts-humor-sans_1.0-3_all.deb tmp
-      cp tmp/usr/share/fonts/truetype/humor-sans/Humor-Sans.ttf ~/.local/share/fonts
-      rm -rf tmp
-    else
-      echo "Not downloading Humor-Sans; file already exists."
-    fi
     fc-cache -f -v
   save_cache:
-    key: fonts-1
+    key: fonts-2
     paths:
       - ~/.local/share/fonts/
   restore_cache:
-    key: fonts-1
+    key: fonts-2
 
 pip-run:  &pip-install
   # Upgrade pip and setuptools and wheel to get as clean an install as possible
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -59,8 +59,8 @@ steps:
     set -e
     case "$(python -c 'import sys; print(sys.platform)')" in
     linux)
-      sudo apt-get update
-      sudo apt-get install \
+      sudo apt update
+      sudo apt install \
         cm-super \
         dvipng \
         ffmpeg \
@@ -69,7 +69,6 @@ steps:
         graphviz \
         inkscape \
         libcairo2 \
-        libgeos-dev \
         libgirepository-1.0.1 \
         lmodern \
         fonts-freefont-otf \
