From 54a2992a5fd32cbad8a0d6fa90e20020d2e4b970 Mon Sep 17 00:00:00 2001 From: flawless Date: Sun, 22 Dec 2024 12:10:50 +0400 Subject: [PATCH 1/3] Bump clojure and testcontainers versions --- deps.edn | 8 ++++---- project.clj | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps.edn b/deps.edn index ce402e7..de6a159 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:paths ["src" "resources"] - :deps {org.clojure/clojure {:mvn/version "1.10.3"} - org.testcontainers/testcontainers {:mvn/version "1.19.7"}} + :deps {org.clojure/clojure {:mvn/version "1.12.0"} + org.testcontainers/testcontainers {:mvn/version "1.20.4"}} :aliases {:dev {:extra-paths "dev-src"} :test {:extra-paths ["test" "test/resources"] @@ -10,7 +10,7 @@ lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"} lambdaisland/kaocha-junit-xml {:mvn/version "1.17.101"} org.clojure/test.check {:mvn/version "1.1.1"} - org.testcontainers/postgresql {:mvn/version "1.19.7"}}} + org.testcontainers/postgresql {:mvn/version "1.20.4"}}} :test-runner {:extra-paths ["test" "test/resources"] :extra-deps {expound/expound {:mvn/version "0.9.0"} @@ -19,7 +19,7 @@ lambdaisland/kaocha-junit-xml {:mvn/version "1.17.101"} org.clojure/test.check {:mvn/version "1.1.1"} orchestra {:mvn/version "2021.01.01-1"} - org.testcontainers/postgresql {:mvn/version "1.19.7"}} + org.testcontainers/postgresql {:mvn/version "1.20.4"}} :main-opts ["-m" "kaocha.runner" "--reporter" "kaocha.report/documentation"]} :cljstyle {:extra-deps {mvxcvi/cljstyle {:mvn/version "0.16.630" diff --git a/project.clj b/project.clj index 675df90..8900c4e 100644 --- a/project.clj +++ b/project.clj @@ -6,8 +6,8 @@ :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} - :dependencies [[org.clojure/clojure "1.10.3"] - [org.testcontainers/testcontainers "1.19.7"]] + :dependencies [[org.clojure/clojure "1.12.0"] + [org.testcontainers/testcontainers "1.20.4"]] :aliases {"test" ["run" "-m" "kaocha.runner"] "cljstyle" ["run" "-m" "cljstyle.main"]} @@ -22,7 +22,7 @@ [org.clojure/test.check "1.1.1"] [orchestra "2021.01.01-1"] [org.clojure/tools.namespace "1.5.0"] - [org.testcontainers/postgresql "1.19.7"] + [org.testcontainers/postgresql "1.20.4"] [com.fzakaria/slf4j-timbre "0.4.1"] [nrepl "1.0.0"]] :source-paths ["dev-src"]} From 5dba45be04f03f0ab0aa633bd58f19dd34c3a158 Mon Sep 17 00:00:00 2001 From: flawless Date: Sun, 22 Dec 2024 12:19:15 +0400 Subject: [PATCH 2/3] Fix actions --- .github/actions/setup-build/action.yml | 4 ++++ .github/workflows/clojure.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml index 78ff70e..2b96420 100644 --- a/.github/actions/setup-build/action.yml +++ b/.github/actions/setup-build/action.yml @@ -13,6 +13,10 @@ runs: path: ~/.m2/repository key: ${{ runner.os }}-lein-${{ hashFiles('**/project.clj') }} restore-keys: ${{ runner.os }}-lein- + - name: Install clojure tools + uses: DeLaGuardo/setup-clojure@13.1 + with: + lein: 2.11.2 - name: Clear existing docker image cache shell: bash run: docker image prune -af diff --git a/.github/workflows/clojure.yml b/.github/workflows/clojure.yml index cbfc1f1..6d92401 100644 --- a/.github/workflows/clojure.yml +++ b/.github/workflows/clojure.yml @@ -11,7 +11,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Setup Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 912c4f6..e340438 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ permissions: jobs: release: name: Release - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout Code uses: actions/checkout@v4 From b9a439df32d01a8a3155d38ce26441369be92853 Mon Sep 17 00:00:00 2001 From: flawless Date: Sat, 28 Dec 2024 09:19:35 +0400 Subject: [PATCH 3/3] Fix deps.edn --- deps.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index de6a159..81e3598 100644 --- a/deps.edn +++ b/deps.edn @@ -18,7 +18,7 @@ lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"} lambdaisland/kaocha-junit-xml {:mvn/version "1.17.101"} org.clojure/test.check {:mvn/version "1.1.1"} - orchestra {:mvn/version "2021.01.01-1"} + orchestra/orchestra {:mvn/version "2021.01.01-1"} org.testcontainers/postgresql {:mvn/version "1.20.4"}} :main-opts ["-m" "kaocha.runner" "--reporter" "kaocha.report/documentation"]}