WIP: update choices

.github/workflows/deploy.yml

@@ -30,8 +30,14 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: install-deps
-        run: sudo apt install -y leiningen make
+      - name: install-system-deps
+        run: sudo apt install -y curl make rlwrap clojure
+      - name: download-newer-clojure
+        run: curl -L -O https://github.com/clojure/brew-install/releases/latest/download/posix-install.sh
+      - name: chmod-posix-install
+        run: chmod +x posix-install.sh
+      - name: install-newer-clojure
+        run: sudo ./posix-install.sh
       - name: make
         run: make
       - name: upload

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
-# ensure `lein` is installled
-# sudo apt install leiningen
+# ensure clj is installed
+# https://clojure.org/guides/install_clojure#posix
 
 # https://www.gnu.org/software/make/manual/html_node/Automatic-Variables.html
 # $@ : target label
@@ -10,18 +10,21 @@
 
 SHELL := bash
 BROWSER ?= firefox
+CLJ ?= clj
 
 .PHONY: default
 default: all
 
-choices/project.clj:
+choices/LICENSE:
 	git submodule update --init --recursive
 	ls -l $@
 	@echo SUCCESS $@
 
-choices/resources/public/js/choices.js: choices/project.clj config.yml
+choices/config.yml: choices/LICENSE config.yml
 	cp -v config.yml choices/config.yml
-	cd choices && lein fig:min
+
+choices/resources/public/js/choices.js: choices/LICENSE choices/config.yml
+	cd choices && $(CLJ) -M:js
 	ls -l $@
 	@echo SUCCESS $@
 
@@ -40,8 +43,8 @@ view: choices/resources/public/index.html
 	@echo SUCCESS $@
 
 .PHONY: choices-test
-choices-test: choices/project.clj
-	cd choices && lein test
+choices-test: choices/LICENSE choices/config.yml
+	cd choices && $(CLJ) -M:test
 	@echo SUCCESS $@
 
 .PHONY: check

README.md

@@ -13,12 +13,15 @@ We welcome contributions, please create [issues](https://github.com/publiccodene
 ## Building and testing
 
 This tool is built upon [Choices](https://git.sr.ht/~bzg/choices) by [Bastien Guerry](https://sr.ht/~bzg/).
-Choices is a ClojureScript project, and can be built with `lein`.
+Choices is a ClojureScript project, and uses `clj`.
 The build process uses `make`.
 On debian-like systems, `lein` and `make` can be installed with `apt`:
 
 ```
-sudo apt install leiningen make
+sudo apt install make
+curl -L -O https://github.com/clojure/brew-install/releases/latest/download/posix-install.sh
+chmod +x posix-install.sh
+sudo ./posix-install.sh
 ```
 
 To make changes, edit the `config.yml` file.

config.yml

@@ -45,7 +45,7 @@ display-score-details: true
 display-score-top-result: true
 
 # In a branch of the tree, should the target node be set depending on
-# the updated value of conditional-score-outputs?
+# the updated value of conditional-score-output?
 conditional-navigation: false
 
 # Some text message to always display after the score results
@@ -74,7 +74,7 @@ score-variables:
 # (2) message (mandatory): message to display when one of the condition is met
 # (3) anything else is a "condition", which lists variables and their minimal
 # values for the condition to be met.
-conditional-score-outputs:
+conditional-score-output:
   cas-1: # free-form
     notification: "is-success"
     priority: 1