Change Linux build to use ubuntu 20.04 instead.

ImageMagick · Nov 5, 2023 · 40c6a4a · 40c6a4a
1 parent 296bc2c
commit 40c6a4a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
@@ -40,7 +40,7 @@ jobs:
   build_linux:
     name: 'Linux Q${{matrix.quantum}}-x64 hdri=${{matrix.hdri}} (${{matrix.modules}})'
     container:
-      image: ubuntu:bionic
+      image: ubuntu:20.04
     runs-on: ubuntu-latest
 
     strategy:
@@ -57,8 +57,9 @@ jobs:
     - name: Install dependencies
       run: |
         set -e
+        export DEBIAN_FRONTEND=noninteractive
         apt update
-        apt-get install -y autoconf pkg-config gcc libfontconfig1-dev libfreetype6-dev libltdl-dev
+        apt-get install -y autoconf gcc g++ libfontconfig1-dev libfreetype6-dev libltdl-dev make pkg-config
 
     - name: Clone msttcorefonts
       uses: actions/checkout@v3

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,22 +13,28 @@ jobs:
   build_linux:
     name: Build Linux
     container:
-      image: ubuntu:bionic
+      image: ubuntu:20.04
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
         compiler: [ gcc, clang ]
+        include:
+          - compiler: gcc
+            packages: gcc g++
+          - compiler: clang
+            packages: clang
 
     steps:
     - uses: actions/checkout@v3
 
     - name: Install dependencies
       run: |
         set -e
+        export DEBIAN_FRONTEND=noninteractive
         apt-get update -y
-        apt-get install -y autoconf pkg-config ${{matrix.compiler}}
+        apt-get install -y autoconf make pkg-config ${{matrix.packages}}
 
     - name: Configure ImageMagick
       run: |
@@ -53,7 +59,7 @@ jobs:
       run: |
         set -e
         export HOMEBREW_NO_AUTO_UPDATE=1
-        brew install autoconf libtool pkg-config libxml2
+        brew install autoconf libtool libxml2 pkg-config
 
     - name: Configure ImageMagick
       run: |