From 54f005d0f5e50e4e63ab6c6af7cecbaa2bb6c4a2 Mon Sep 17 00:00:00 2001
From: Paul Cadman <git@paulcadman.dev>
Date: Tue, 16 Apr 2024 11:46:15 +0100
Subject: [PATCH] Use justfile in CI build

---
 .github/workflows/ci.yml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8274ede166..df3cdf979c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,7 @@ env:
   VAMPIRREPO: anoma/vamp-ir
   VAMPIRVERSION: v0.1.3
   CAIRO_VM_VERSION: ae06ba04f3b6864546b6baeeebf1b0735ddccb5d
+  JUST_ARGS: enableOptimized=yes runtimeCcArg=$CC runtimeLibtoolArg=$LIBTOOL
 
 jobs:
   pre-commit:
@@ -58,6 +59,9 @@ jobs:
   build-and-test-linux:
     runs-on: ubuntu-22.04
     steps:
+      - name: install just
+        run: sudo snap install --edge --classic just
+
       - name: Checkout our repository
         uses: actions/checkout@v3
         with:
@@ -158,7 +162,7 @@ jobs:
       - name: Make runtime
         run: |
           cd main
-          make runtime
+          just ${{ env.JUST_ARGS }} build runtime
 
       # We use the options:
       #   - -fhide-source-paths
@@ -176,9 +180,10 @@ jobs:
 
       - name: Stack setup
         id: stack
-        uses: freckle/stack-action@v4
+        uses: freckle/stack-action@v5
         with:
           working-directory: main
+          stack-build-arguments: -j4 --ghc-options=-j
           test: false
 
       - name: Install and test Juvix
@@ -186,8 +191,8 @@ jobs:
         if: ${{ success() }}
         run: |
           cd main
-          make install
-          make test
+          just ${{ env.JUST_ARGS }} install
+          just ${{ env.JUST_ARGS }} test
 
       - name: Typecheck and format Juvix examples
         if: ${{ success() }}
@@ -225,6 +230,9 @@ jobs:
   build-and-test-macos:
     runs-on: macos-12
     steps:
+      - name: Install just
+        run: brew install just
+
       - name: Checkout our repository
         uses: actions/checkout@v3
         with:
@@ -354,7 +362,7 @@ jobs:
       - name: Make runtime
         run: |
           cd main
-          make CC=$CC LIBTOOL=$LIBTOOL runtime
+          just ${{ env.JUST_ARGS }} build runtime
 
       # We use the options:
       #   - -fhide-source-paths
@@ -372,9 +380,10 @@ jobs:
 
       - name: Stack setup
         id: stack
-        uses: freckle/stack-action@v4
+        uses: freckle/stack-action@v5
         with:
           working-directory: main
+          stack-build-arguments: -j4 --ghc-options=-j
           test: false
 
       - name: Add homebrew clang to the PATH (macOS)
@@ -399,8 +408,8 @@ jobs:
         if: ${{ success() }}
         run: |
           cd main
-          make CC=$CC LIBTOOL=$LIBTOOL install
-          make CC=$CC LIBTOOL=$LIBTOOL test
+          just ${{ env.JUST_ARGS }} install
+          just ${{ env.JUST_ARGS }} test
 
       - name: Typecheck and format Juvix examples
         if: ${{ success() }}