From 84328615a1d4e8329df37142ab18cabedc2ce307 Mon Sep 17 00:00:00 2001
From: Paulo Matos <pmatos@linki.tools>
Date: Tue, 16 Mar 2021 09:37:49 +0100
Subject: [PATCH] Fix Chez workflow to run inside a container

Fixes #3730.

By running inside a container we avoid CI breakages caused by changes
in the VM base image. In any case, lso update to use base image
ubuntu-20.04.
---
 .github/workflows/chez-build.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/chez-build.yml b/.github/workflows/chez-build.yml
index 80d745184a..eafaa8bc84 100644
--- a/.github/workflows/chez-build.yml
+++ b/.github/workflows/chez-build.yml
@@ -16,8 +16,9 @@ on:
       
 jobs:
   build-linux:
-    runs-on: ubuntu-18.04
-    
+    runs-on: ubuntu-20.04
+    container: ubuntu:20.04
+
     strategy:
       fail-fast: false
       matrix:
@@ -27,6 +28,10 @@ jobs:
       MACH: ${{ matrix.mach }}
 
     steps:
+      - name: Download base dependencies
+        run: |
+          apt-get update
+          apt-get install -y make git gcc
       - uses: actions/checkout@v2
         with:
           fetch-depth: 50
@@ -37,13 +42,13 @@ jobs:
       - name: Install libs for 32-bit
         if: matrix.mach == 'i3le' || matrix.mach == 'ti3le'
         run: |
-          sudo dpkg --add-architecture i386
-          sudo apt-get update
-          sudo apt-get install -y gcc-multilib lib32ncurses5-dev libx32ncurses5-dev libssl-dev:i386
+          dpkg --add-architecture i386
+          apt-get update
+          apt-get install -y gcc-multilib lib32ncurses-dev libssl-dev:i386
       - name: Install libs for 64-bit
         run: |
-          sudo apt-get update
-          sudo apt-get install -y libncurses5-dev libssl-dev
+          apt-get update
+          apt-get install -y libncurses5-dev libssl-dev libx11-dev
       - name: Build Chez with PB boot files
         working-directory: racket/src/ChezScheme
         run: |