diff --git a/.github/workflows/validation_delaguardo.yml b/.github/workflows/validation_delaguardo.yml
index c19fe646..a59791a6 100644
--- a/.github/workflows/validation_delaguardo.yml
+++ b/.github/workflows/validation_delaguardo.yml
@@ -1,5 +1,9 @@
name: Commit validation - Delaguardo flavor
-on: [push]
+on:
+ push:
+ branches:
+ - main
+ - la
jobs:
clojure:
strategy:
@@ -31,5 +35,4 @@ jobs:
key: cljdeps-${{ hashFiles('deps.edn', 'bb.edn') }}
restore-keys: cljdeps-
- name: Test
- run: bb heph-task gha
-
+ run: bb wf-4 -ibawl -d :common-test
diff --git a/bb.edn b/bb.edn
index 8fe36fa3..c3ca7388 100644
--- a/bb.edn
+++ b/bb.edn
@@ -1,17 +1,20 @@
-;; The file is updated automatically
-{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.0.1"}}
+{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.1.0"}}
:paths []
:tasks
- {:requires [[automaton-build.tasks.launcher.bb-entrypoint :as build-task-bb-entrypoint]
- [babashka.process :as babahska-process]]
- heph-task {:doc "Launch an Hephaistox task"
- :task (System/exit (build-task-bb-entrypoint/-main *command-line-args*))}
+ {-base-deps {:doc "Dependencies for a task using bb"
+ :extra-deps {org.clojure/tools.cli {:mvn/version "1.1.230"}}}
+ :requires [[automaton-build.tasks.common :as tasks-common]]
lconnect
{:doc
- "Repl in case automaton-web is failing. Using -f or --force cli arguments to force start if some part are failing"
+ "Repl in case automaton-build is failing. Using -f or --force cli arguments to force start if some part are failing"
:task (try (-> (babahska-process/shell "clojure"
"-M:common-test:env-development-repl:build"
*command-line-args*)
System/exit)
(catch Exception e
- (println "Repl failed also - error during repl startup" (ex-message e))))}}}
+ (println "Repl failed also - error during repl startup" (ex-message e))))}
+ wf-4 {:depends [-base-deps]
+ :doc "Full test and formatting."
+ :enter (tasks-common/enter wf-4/cli-opts (current-task))
+ :requires [[automaton-build.tasks.4 :as wf-4]]
+ :task (System/exit (wf-4/run [:common-test :env-development-test]))}}}
diff --git a/deps.edn b/deps.edn
index def46919..7607535f 100644
--- a/deps.edn
+++ b/deps.edn
@@ -1,8 +1,8 @@
{:aliases
{:antq {:deps {com.github.liquidz/antq {:mvn/version "2.9.1217"}}
:main-opts ["-m" "antq.core"]}
- :bb-deps {:extra-deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.0.1"}}}
- :build {:extra-deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.0.1"}}
+ :bb-deps {:extra-deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.1.0"}}}
+ :build {:extra-deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.1.0"}}
:ns-default build}
:cljs-deps {:extra-deps {binaryage/devtools #:mvn{:version "1.0.7"}
clj-commons/pushy #:mvn{:version "0.3.10"}
@@ -28,15 +28,15 @@
"test/cljc/"
"env/development/src/cljc/"
"env/development/src/cljs/"]}
- :common-test {:exec-fn cognitect.test-runner.api/test
- :extra-deps {com.cognitect/test-runner
- {:git/url "https://github.com/cognitect-labs/test-runner"
- :sha "9d36f36ff541dac680a05010e4348c744333f191"}
- org.clojure/tools.namespace #:mvn{:version "1.5.0"}
- org.clojure/tools.reader #:mvn{:version "1.5.0"}}
- :extra-paths ["test/clj/" "test/cljc/" "test/resources/"]
- :jvm-opts ["-Dheph-conf=env/test/config.edn,env/common_config.edn"]}
- :env-development-repl {:extra-deps {org.clojars.hephaistox/automaton-core #:mvn{:version "1.3.1"}
+ :common-test
+ {:exec-fn cognitect.test-runner.api/test
+ :extra-deps {com.cognitect/test-runner {:git/url "https://github.com/cognitect-labs/test-runner"
+ :sha "9d36f36ff541dac680a05010e4348c744333f191"}
+ org.clojure/tools.namespace #:mvn{:version "1.5.0"}
+ org.clojure/tools.reader #:mvn{:version "1.5.0"}}
+ :extra-paths ["test/clj/" "test/cljc/" "test/resources/"]
+ :jvm-opts ["-Dheph-conf=env/test/config.edn,env/common_config.edn" "-Dhephaistox-in-test=true"]}
+ :env-development-repl {:extra-deps {org.clojars.hephaistox/automaton-core #:mvn{:version "1.4.0"}
org.clojure/core.async #:mvn{:version "1.6.681"}}
:extra-paths ["env/development/resources/"
"env/development/src/clj/"
@@ -44,7 +44,12 @@
:jvm-opts ["-Dheph-conf=env/development/config.edn,env/common_config.edn"]
:main-opts ["-m" "automaton-web.repl.entry-point"]}
:env-development-test
- {:jvm-opts
+ {:exec-fn cognitect.test-runner.api/test
+ :extra-deps {com.cognitect/test-runner {:git/url "https://github.com/cognitect-labs/test-runner"
+ :sha "9d36f36ff541dac680a05010e4348c744333f191"}
+ org.clojure/tools.namespace {:mvn/version "1.5.0"}
+ org.clojure/tools.reader {:mvn/version "1.5.0"}}
+ :jvm-opts
["-Dclojure.tools.logging.factory=clojure.tools.logging.impl/log4j2-factory"
"-Dhephaistox-in-test=true"
"-Dlog4j.configurationFile=resources/log_config/appenders.properties,resources/log_config/logging-tests.properties"]
@@ -57,7 +62,7 @@
metosin/reitit #:mvn{:version "0.7.1"}
metosin/ring-http-response #:mvn{:version "0.9.4"}
mount/mount #:mvn{:version "0.1.19"}
- org.clojars.hephaistox/automaton-core #:mvn{:version "1.3.1"}
+ org.clojars.hephaistox/automaton-core #:mvn{:version "1.4.0"}
ring-cors/ring-cors #:mvn{:version "0.1.13"}
ring/ring #:mvn{:version "1.12.2"}
ring/ring-anti-forgery #:mvn{:version "1.3.1"}
diff --git a/pom.xml b/pom.xml
index 73ab6983..6435b9c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
jar
org.clojars.hephaistox
automaton-web
- 2.0.0
+ 2.1.0
automaton-web
@@ -30,7 +30,7 @@
org.clojars.hephaistox
automaton-core
- 1.3.1
+ 1.4.0
ring-cors
diff --git a/project.edn b/project.edn
index a0e4e85a..63375617 100644
--- a/project.edn
+++ b/project.edn
@@ -5,4 +5,7 @@
{:doc "Updating any of taoensso libs results in cljs warnings comming from taoensso/timbre"
:name "com.taoensso/tempura"
:version "1.5.3"}
- {:name "marked"}]}}
+ {:name "marked"}]}
+ :frontend {:css "resources/css/custom.css"
+ :run-aliases [:automaton-web-portfolio :browser-test :ltest]}
+ :publication {:as-lib org.clojars.hephaistox/automaton-web}}
diff --git a/version.edn b/version.edn
index a8f59fb1..3f907357 100644
--- a/version.edn
+++ b/version.edn
@@ -1,2 +1,2 @@
;; Last generated version, note a failed push consume a number
-{:version "2.0.0"}
\ No newline at end of file
+{:version "2.1.0"}
\ No newline at end of file