From 7e42a134caa34d431586c562cf4daf264f851b87 Mon Sep 17 00:00:00 2001 From: Marco Biscaro Date: Tue, 27 Aug 2024 16:38:06 -0300 Subject: [PATCH 1/4] Update GitHub workflows - Use latest actions version - Run test matrix against Java 17 and 21 as well --- .github/workflows/clojure.yml | 43 +++++++++++------------------------ .github/workflows/release.yml | 40 +++++++++----------------------- 2 files changed, 24 insertions(+), 59 deletions(-) diff --git a/.github/workflows/clojure.yml b/.github/workflows/clojure.yml index a82ab0d..dc41d9e 100644 --- a/.github/workflows/clojure.yml +++ b/.github/workflows/clojure.yml @@ -7,37 +7,19 @@ on: branches: [ master ] jobs: - test-using-java-8: - name: 'Test using Java 8' + test-using-java: + strategy: + matrix: + java-version: [ '8', '11', '17', '21' ] + name: Test using Java ${{ matrix.java-version }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v4 with: - java-version: 8 - - - name: Print java version - run: java -version - - - name: Install dependencies - run: lein deps - - - name: Run clj tests - run: lein test - - - name: Run midje tests - run: lein midje - - test-using-java-11: - name: 'Test using Java 11' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - uses: actions/setup-java@v1 - with: - java-version: 11 + distribution: 'temurin' + java-version: ${{ matrix.java-version }} - name: Print java version run: java -version @@ -55,11 +37,12 @@ jobs: name: 'Lint' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v4 with: - java-version: 11 + distribution: 'temurin' + java-version: 21 - name: Lint check run: lein lint diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 20698e0..9243fad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,37 +6,19 @@ on: - '*' jobs: - test-using-java-8: - name: 'Test using Java 8' + test-using-java: + strategy: + matrix: + java-version: [ '8', '11', '17', '21' ] + name: Test using Java ${{ matrix.java-version }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v4 with: - java-version: 8 - - - name: Print java version - run: java -version - - - name: Install dependencies - run: lein deps - - - name: Run clj tests - run: lein test - - - name: Run midje tests - run: lein midje - - test-using-java-11: - name: 'Test using Java 11' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - uses: actions/setup-java@v1 - with: - java-version: 11 + distribution: 'temurin' + java-version: ${{ matrix.java-version }} - name: Print java version run: java -version @@ -53,9 +35,9 @@ jobs: release: name: 'Publish on Clojars' runs-on: ubuntu-latest - needs: [test-using-java-11, test-using-java-8] + needs: test-using-java steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install dependencies run: lein deps From 8269d9b12ddda333b8c5b6b2b75c87f9b9060a29 Mon Sep 17 00:00:00 2001 From: Marco Biscaro Date: Tue, 27 Aug 2024 16:38:26 -0300 Subject: [PATCH 2/4] Update dependencies --- project.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index fb6da60..c29f1cb 100644 --- a/project.clj +++ b/project.clj @@ -18,7 +18,7 @@ [lein-nsorg "0.3.0"] [changelog-check "0.1.0"]] - :dependencies [[org.clojure/clojure "1.11.3"] + :dependencies [[org.clojure/clojure "1.11.4"] [com.taoensso/timbre "6.5.0"] [funcool/cats "2.4.2"] [nubank/matcher-combinators "3.9.1"]] @@ -32,11 +32,11 @@ :profiles {:uberjar {:aot :all} :dev {:source-paths ["dev"] - :dependencies [[ns-tracker "0.4.0"] + :dependencies [[ns-tracker "1.0.0"] [org.clojure/tools.namespace "1.5.0"] [midje "1.10.10"] [org.clojure/java.classpath "1.1.0"] - [rewrite-clj "1.1.47"]]}} + [rewrite-clj "1.1.48"]]}} :aliases {"coverage" ["cloverage" "-s" "coverage"] "lint" ["do" ["cljfmt" "check"] ["nsorg"]] From 53c5b1a38f9c42273ea18eb3da7239447bdd2865 Mon Sep 17 00:00:00 2001 From: Marco Biscaro Date: Tue, 27 Aug 2024 16:40:59 -0300 Subject: [PATCH 3/4] Version 5.18.0-beta01 --- CHANGELOG.md | 6 ++++++ project.clj | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7da0406..de64c99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [5.18.0] +- Bump dependencies + - org.clojure/clojure from 1.11.1 to 1.11.4 + - com.taoensso/timbre from 4.10.0 to 6.5.0 + - nubank/matcher-combinators from 3.5.0 to 3.9.1 + ## [5.17.0] - revert linter `state-flow.labs.state/with-redefs` diff --git a/project.clj b/project.clj index c29f1cb..c4474b0 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject nubank/state-flow "5.17.0" +(defproject nubank/state-flow "5.18.0-beta01" :description "Integration testing with composable flows" :url "https://github.com/nubank/state-flow" :license {:name "MIT"} From 57e6b8f7cccbf4340f217e198bb0298893cb258f Mon Sep 17 00:00:00 2001 From: Marco Biscaro Date: Tue, 27 Aug 2024 16:48:11 -0300 Subject: [PATCH 4/4] Version 5.18.0 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index c4474b0..8aba873 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject nubank/state-flow "5.18.0-beta01" +(defproject nubank/state-flow "5.18.0" :description "Integration testing with composable flows" :url "https://github.com/nubank/state-flow" :license {:name "MIT"}