From 60514a0684fc7b031dc4edeef9acecd468c89f52 Mon Sep 17 00:00:00 2001
From: David Chisnall <github@theravensnest.org>
Date: Tue, 16 Jul 2024 15:12:41 +0100
Subject: [PATCH] Use the sail container for builds (hopefully faster)!

---
 .github/workflows/compile.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
index 2794021..0f2ced5 100644
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -13,22 +13,20 @@ concurrency:
 
 jobs:
   build:
-    runs-on: [ubuntu-20.04]
+    runs-on: [ubuntu-24.04]
+    container: ghcr.io/cheriot-platform/sail:latest
     steps:
-    - name: Install dependencies
-      run: |
-        sudo apt update
-        sudo apt install -y --no-install-recommends opam zlib1g-dev pkg-config libgmp-dev z3 cvc4 texlive-plain-generic texlive-latex-base texlive-latex-recommended texlive-latex-extra texlive-science texlive-fonts-recommended texlive-fonts-extra texlive-bibtex-extra texlive-extra-utils latexmk
-    - name: Init opam
-      run: opam init -y
-    - name: Install sail
-      run: git clone -n https://github.com/rems-project/sail.git && cd sail && git checkout bb50f71dced35cd199554f0360a93b934e6443a1 && opam install -y .
     - name: Check out repository code
       uses: actions/checkout@HEAD
       with:
         submodules: true
+    - name: Install dependencies
+      run: |
+        apt update
+        apt install -y --no-install-recommends pkg-config texlive-plain-generic texlive-latex-base texlive-latex-recommended texlive-latex-extra texlive-science texlive-fonts-recommended texlive-fonts-extra texlive-bibtex-extra texlive-extra-utils latexmk
     - name: Build simulators
       run: |
+        export HOME=/root/
         eval $(opam env) && make csim
         mkdir install
         cp c_emulator/cheriot_sim install
@@ -36,6 +34,7 @@ jobs:
         cp sail-riscv/LICENCE install/LICENCE-sail-riscv
     - name: Build arch doc
       run: |
+        export HOME=/root/
         eval $(opam env) && make -C archdoc
         cp archdoc/cheriot-architecture.pdf install
         mkdir -p _site/
@@ -61,7 +60,7 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: [ubuntu-20.04]
+    runs-on: [ubuntu-24.04]
     needs: build
     steps:
       - name: Deploy to GitHub Pages