Merge branch 'dev' into stepper-filter-fix-matching

hazelgrove · Aug 25, 2024 · b0e33c3 · b0e33c3
2 parents 919179c + cb85b20
commit b0e33c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/deploy_branches.yml b/.github/workflows/deploy_branches.yml
@@ -45,11 +45,13 @@ jobs:
           opam exec -- dune build @src/fmt --auto-promote src --profile release
         working-directory: ./source
       - name: Checkout the website build artifacts repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: hazelgrove/build
           token: ${{ secrets.ACCESS_TOKEN }}
           path: server
+          sparse-checkout: |
+            ${{ env.BRANCH_NAME }}
       - name: Clear any old build of this branch
         run: if [ -d "${BRANCH_NAME}" ] ; then rm -rf "${BRANCH_NAME}" ; fi 
         working-directory: ./server

diff --git a/Makefile b/Makefile
@@ -23,7 +23,8 @@ setup-instructor:
 setup-student: 
 	cp src/haz3lweb/ExerciseSettings_student.re src/haz3lweb/ExerciseSettings.re
 
-dev-helper: 
+dev-helper:
+	dune fmt --auto-promote || true
 	dune build @src/fmt --auto-promote src --profile dev
 
 dev: setup-instructor dev-helper
@@ -58,8 +59,12 @@ repl:
 	dune utop src/haz3lcore
 
 test:
+	dune fmt --auto-promote || true
 	dune build @src/fmt @test/fmt --auto-promote src test --profile dev
 	node $(TEST_DIR)/haz3ltest.bc.js
 
+watch-test:
+	dune build @fmt @runtest --auto-promote --watch
+
 clean:
 	dune clean