Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into util_tests
Browse files Browse the repository at this point in the history
7h3kk1d committed Aug 26, 2024
2 parents fb5b2eb + cb85b20 commit ff83c68
Showing 2 changed files with 9 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/deploy_branches.yml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit ff83c68

Please sign in to comment.