diff --git a/.github/workflows/commit_validation.yml b/.github/workflows/commit_validation.yml
deleted file mode 100644
index 4c4c73ef..00000000
--- a/.github/workflows/commit_validation.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Commit validation
-run-name: ${{ github.event.head_commit.message }} pushed by ${{ github.actor }}, to test and lint - $${{ github.sha }}
-on: [push]
-jobs:
- run-bb:
- runs-on: ubuntu-latest
- steps:
- - name: Check out repository code
- uses: actions/checkout@v4
- - name: Set ownership
- run: |
- # this is to fix GIT not liking owner of the checkout dir, See https://github.com/actions/runner/issues/2033
- chown -R $(id -u):$(id -g) $PWD
- - name: Base image
- uses: docker://hephaistox/gha-automaton-web:1.2.15
diff --git a/.github/workflows/validation_delaguardo.yml b/.github/workflows/validation_delaguardo.yml
new file mode 100644
index 00000000..4f97ab28
--- /dev/null
+++ b/.github/workflows/validation_delaguardo.yml
@@ -0,0 +1,34 @@
+name: Commit validation - Delaguardo flavor
+on: [push]
+jobs:
+ clojure:
+ strategy:
+ matrix:
+ os: [ubuntu-latest, macOS-latest] # , windows-latest There is a path issue
+ runs-on: ${{ matrix.os }}
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ - name: Prepare java
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'zulu'
+ java-version: '22'
+
+ - name: Install clojure tools
+ uses: DeLaGuardo/setup-clojure@12.5
+ with:
+ cli: 1.11.4.1474 # Clojure CLI based on tools.deps
+ bb: 1.3.191 # Babashka
+ clj-kondo: 2024.08.01 # Clj-kondo
+ cljfmt: 0.10.2 # cljfmt
+ zprint: 1.2.9 # zprint
+ - name: Cache clojure dependencies
+ uses: actions/cache@v4
+ with:
+ path: /home/runner/.m2/repository
+ key: cljdeps-${{ hashFiles('deps.edn', 'bb.edn') }}
+ restore-keys: cljdeps-
+ - name: Test
+ run: bb heph-task gha
+
diff --git a/.github/workflows/validation_docker.yml b/.github/workflows/validation_docker.yml
new file mode 100644
index 00000000..644566d6
--- /dev/null
+++ b/.github/workflows/validation_docker.yml
@@ -0,0 +1,11 @@
+name: Commit validation - docker flavor
+run-name: Test ${{ github.event.head_commit.message }}
+on: [push]
+jobs:
+ run-bb:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out repository code
+ uses: actions/checkout@v4
+ - name: Base image
+ uses: docker://hephaistox/gha-image:1.0.1
diff --git a/bb.edn b/bb.edn
index e12beb04..406e0102 100644
--- a/bb.edn
+++ b/bb.edn
@@ -1,5 +1,5 @@
;; The file is updated automatically
-{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "2.0.2"}}
+{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.0.0"}}
:paths []
:tasks
{:requires
diff --git a/deps.edn b/deps.edn
index 8c8b8065..d9019645 100644
--- a/deps.edn
+++ b/deps.edn
@@ -2,9 +2,9 @@
{: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 "2.0.2"}}}
+ #:mvn{:version "3.0.0"}}}
:build {:extra-deps {org.clojars.hephaistox/automaton-build
- #:mvn{:version "2.0.2"}}
+ #:mvn{:version "3.0.0"}}
:ns-default build}
:cljs-deps {:extra-deps {binaryage/devtools #:mvn{:version "1.0.7"}
clj-commons/pushy #:mvn{:version "0.3.10"}
@@ -41,7 +41,7 @@
: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.2.9"}
+ "1.3.0"}
org.clojure/core.async #:mvn{:version "1.6.681"}}
:extra-paths ["env/development/resources/"
"env/development/src/clj/"
@@ -69,7 +69,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.2.9"}
+ org.clojars.hephaistox/automaton-core #:mvn{:version "1.3.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/package-lock.json b/package-lock.json
index 4a479692..2192b271 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
"tw-elements": "^2.0.0"
},
"devDependencies": {
- "@hephaistox/tailwind-config": "github:hephaistox/tailwind-config#dev",
+ "@hephaistox/tailwind-config": "github:hephaistox/tailwind-config#main",
"@tailwindcss/forms": "^0.5.7",
"highlight.js": "^11.10.0",
"karma": "^6.4.4",
@@ -56,7 +56,7 @@
},
"node_modules/@hephaistox/tailwind-config": {
"version": "1.0.0",
- "resolved": "git+ssh://git@github.com/hephaistox/tailwind-config.git#9addc31d4e78f5b50488d852a519dee63be65b4f",
+ "resolved": "git+ssh://git@github.com/hephaistox/tailwind-config.git#f03b53ac4a04627d9230f80a2382adbb827ffa7b",
"dev": true,
"license": "ISC"
},
diff --git a/package.json b/package.json
index 6d4b0e26..94c23675 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
},
"workspaces": [],
"devDependencies": {
- "@hephaistox/tailwind-config": "github:hephaistox/tailwind-config#dev",
+ "@hephaistox/tailwind-config": "github:hephaistox/tailwind-config#main",
"@tailwindcss/forms": "^0.5.7",
"highlight.js": "^11.10.0",
"karma": "^6.4.4",
diff --git a/pom.xml b/pom.xml
index bf9455d8..beedf029 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
jar
org.clojars.hephaistox
automaton-web
- 1.2.15
+ 1.3.0
automaton-web
@@ -30,7 +30,7 @@
org.clojars.hephaistox
automaton-core
- 1.2.9
+ 1.3.0
ring-cors
diff --git a/version.edn b/version.edn
index 3aef222b..a22474e2 100644
--- a/version.edn
+++ b/version.edn
@@ -1,2 +1,2 @@
;; Last generated version, note a failed push consume a number
-{:version "1.2.15"}
\ No newline at end of file
+{:version "1.3.0"}
\ No newline at end of file