From d6947aab6f56bed420c8c5ae973f8224986af829 Mon Sep 17 00:00:00 2001
From: Hrutvik Kanabar <hrutvikkanabar@yahoo.co.uk>
Date: Thu, 8 Aug 2024 19:12:30 +0100
Subject: [PATCH] Update CI containers and actions

Also run short CI steps on GitHub runners, instead of self-hosting.
This avoids queuing these short steps behind the longer build step.
---
 .github/workflows/pure.yml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pure.yml b/.github/workflows/pure.yml
index 8cd7bc4a..b28c5059 100644
--- a/.github/workflows/pure.yml
+++ b/.github/workflows/pure.yml
@@ -20,7 +20,7 @@ jobs:
 
   build:
     runs-on: self-hosted
-    container: ubuntu:20.04
+    container: ubuntu:latest
     timeout-minutes: 600
 
     env:
@@ -43,7 +43,7 @@ jobs:
         apt install -y git build-essential gcc-10 libffi-dev wget mlton
 
     - name: Checkout Poly/ML
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: polyml/polyml
         ref: fixes-5.9
@@ -56,17 +56,17 @@ jobs:
         make install
 
     - name: Checkout HOL4
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: HOL-Theorem-Prover/HOL
         ref: master
         path: HOL
     - name: Checkout pure
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: pure
     - name: Checkout CakeML
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: CakeML/CakeML
         path: cakeml
@@ -135,7 +135,7 @@ jobs:
       run: cd pure/compiler/binary && Holmake
 
     - name: Save build artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: pure.S
         path: pure/compiler/binary/pure.S
@@ -144,8 +144,7 @@ jobs:
       run: cd pure/examples && make check
     - name: Check that benchmarks compile
       run: |
-        apt install -y python3 python3-pip
-        pip install parse matplotlib pandas
+        apt install -y python3 python3-parse python3-matplotlib python3-pandas
         cd pure/examples
         git apply benchmark/benchmark.patch
         touch lib/basis_ffi.c
@@ -156,8 +155,8 @@ jobs:
     needs: build
     permissions:
       contents: write
-    runs-on: self-hosted
-    container: ubuntu:20.04
+    runs-on: ubuntu-latest
+    container: ubuntu:latest
     env:
       COMMITS: ${{ github.workspace }}/commits.txt
 
@@ -177,7 +176,7 @@ jobs:
         echo "CakeML checkout: CakeML/CakeML@${{ needs.build.outputs.cakeml_sha }}" >> $COMMITS
 
     - name: Download build artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: pure.S
 
@@ -190,8 +189,8 @@ jobs:
 
   notify:
     needs: build
-    runs-on: self-hosted
-    container: ubuntu:20.04
+    runs-on: ubuntu-latest
+    container: ubuntu:latest
     if: ${{ always() }}
 
     steps: