Add tool versioning with mise (#93)

.github/actions/cache-deps/action.yaml

@@ -0,0 +1,14 @@
+name: Install and cache deps
+runs:
+  using: composite
+  steps:
+    - uses: jdx/mise-action@v2
+    - name: Cache Clojure dev dependencies
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-clojure-dev-${{ hashFiles('**/deps.edn') }}
+        restore-keys: ${{ runner.os }}-clojure-dev
+    - name: Install Clojure dev deps
+      shell: bash
+      run: make deps

.github/actions/restore-deps/action.yaml

@@ -0,0 +1,11 @@
+name: Restore deps
+runs:
+  using: composite
+  steps:
+    - uses: jdx/mise-action@v2
+    - name: Restore cached clojure dev deps
+      uses: actions/cache/restore@v4
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-clojure-dev-${{ hashFiles('**/deps.edn') }}
+        restore-keys: ${{ runner.os }}-clojure-dev

.github/workflows/_checks.yaml

@@ -0,0 +1,34 @@
+name: Checks
+
+
+on:
+  workflow_call:
+
+jobs:
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: jdx/mise-action@v2
+      - name: Fmt
+        run: make fmt-check
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/restore-deps
+      - name: Lint
+        run: make lint-init && make lint
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/restore-deps
+      - name: Run tests
+        env:
+          DATABASE_HOST_PORT: "localhost:5555"
+        run: |
+          docker-compose up -d test-postgres
+          make test-ci

.github/workflows/master.yaml

@@ -0,0 +1,17 @@
+name: Checks
+
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  deps:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/cache-deps
+
+  checks:
+    needs: [ deps ]
+    uses: ./.github/workflows/_checks.yaml

.github/workflows/pr.yaml

@@ -0,0 +1,26 @@
+name: Checks
+
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  deps:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/cache-deps
+
+  checks:
+    needs: [ deps ]
+    uses: ./.github/workflows/_checks.yaml
+
+  outdated:
+    runs-on: ubuntu-latest
+    needs: [ deps ]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/restore-deps
+      - name: Outdated deps
+        run: make outdated

.github/workflows/release.yaml

@@ -8,33 +8,24 @@ on:
 
 
 jobs:
-  check:
+  deps:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/cache-deps
 
-      - name: Lint
-        run: docker-compose run --rm check bash -c "make deps && make lint-init > /dev/null 2>&1 || true && make lint"
-
-      - name: Fmt
-        run: docker-compose run --rm check make fmt-check
-
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Test
-        run: docker-compose run --rm test bash -c "make deps && make test-ci"
+  checks:
+    needs: [ deps ]
+    uses: ./.github/workflows/_checks.yaml
 
 #  deploy:
 #    runs-on: ubuntu-latest
 #    if: ${{ github.event.workflow_run.conclusion == 'success' }}
 #    steps:
 #      - uses: actions/checkout@v4
-#
+#      - uses: jdx/mise-action@v2
 #      - name: Build jar-file and deploy to Clojars
-#        run: docker-compose run --rm build bash -c "make deploy-ci"
+#        run: make deploy-ci
 #        env:
 #          CLOJARS_PASSWORD: ${{secrets.CLOJARS_PASSWORD}}
 #          CLOJARS_USERNAME: ${{secrets.CLOJARS_USERNAME}}

.mise.toml

@@ -0,0 +1,7 @@
+[tools]
+task = "3.37.2"
+java = "temurin-21.0.2+13.0.LTS"
+clojure = "1.11.3.1463"
+cljstyle = "0.16.626"
+clj-kondo = "2024.05.24"
+lefthook = "1.6.14"

Makefile

@@ -22,7 +22,7 @@ help:
 .PHONY: deps  # Install deps
 deps:
 	@$(INFO) "Install deps..."
-	@clojure -P -X:test:dev
+	@clojure -P -X:test:dev:outdated
 
 
 .PHONY: repl  # Running repl
@@ -52,8 +52,7 @@ lint:
 .PHONY: lint-init  # Linting code with libraries
 lint-init:
 	@$(INFO) "Linting project's classpath..."
-	@clj-kondo --parallel --lint $(shell clj -Spath)
-	@clj-kondo --dependencies --copy-configs --lint $(DIRS)
+	@clj-kondo --parallel --dependencies --copy-configs --lint $(shell clj -Spath)
 
 
 .PHONY: outdated  # Check deps versions
@@ -91,18 +90,6 @@ up:
 	@docker-compose up -d db test-postgres
 
 
-.PHONY: ps  # List docker containers
-ps:
-	@$(INFO) "List docker containers..."
-	@docker-compose ps
-
-
-.PHONY: stop  # Stop docker containers
-stop:
-	@$(INFO) "Stopping docker containers..."
-	@docker-compose stop
-
-
 # Testing commands
 
 .PHONY: migrations  # Making migrations

README.md

@@ -768,6 +768,14 @@ $ java -jar target/standalone.jar
 
 ## Development
 
+### Install system deps
+
+Install [mise-en-place](https://mise.jdx.dev/getting-started.html#quickstart) and run:
+
+```shell
+mise install
+```
+
 ### Run locally
 
 ```shell

docker-compose.yaml

@@ -1,11 +1,6 @@
 version: "3.8"
 
 services:
-  check:
-    image: abogoyavlensky/clojure-temurin17-build:0.1.1
-    volumes:
-      - .:/app
-
   db:
     image: postgres:14-alpine
     ports:
@@ -25,24 +20,3 @@ services:
       POSTGRES_DB: automigrate
       POSTGRES_USER: automigrate
       POSTGRES_PASSWORD: automigrate
-
-  # For testing in CI
-
-  test:
-    image: abogoyavlensky/clojure-temurin17-build:0.1.1
-    depends_on:
-      - test-postgres
-    environment:
-      DATABASE_HOST_PORT: "test-postgres:5432"
-    volumes:
-      - .:/app
-
-  # Build jar-file in CI
-
-  build:
-    image: abogoyavlensky/clojure-temurin17-build:0.1.1
-    environment:
-      - CLOJARS_PASSWORD
-      - CLOJARS_USERNAME
-    volumes:
-      - .:/app

src/automigrate/help.clj

@@ -47,4 +47,3 @@
     (if (some? cmd)
       (-> public-methods (fn-docstring cmd) (print-out-str))
       (-> public-methods (general-help) (print-out-str)))))
-

src/automigrate/util/validation.clj

@@ -19,4 +19,3 @@
               (not (contains? all-defined-types (-> field-def :type last))))))
         (mapv #(keyword (name model-name) (-> % key name)))))
     models))
-