From 3a54431d4bc995ef642b400d876d8263f8e3e18a Mon Sep 17 00:00:00 2001 From: joanne cheng Date: Thu, 2 Oct 2025 10:25:16 +0200 Subject: [PATCH] Add gh workflow - run bin/kaocha in gh workflow - update readme - delete .circleci/ --- .circleci/config.yml | 47 -------------------------------------- .github/workflows/main.yml | 44 +++++++++++++++++++++++++++++++++++ README.md | 4 ++-- bb.edn | 2 +- 4 files changed, 47 insertions(+), 50 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/workflows/main.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 2f31820..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,47 +0,0 @@ -version: 2.1 - -orbs: - kaocha: lambdaisland/kaocha@0.0.3 - clojure: lambdaisland/clojure@0.0.8 - -commands: - checkout_and_run: - parameters: - clojure_version: - type: string - steps: - - checkout - - clojure/with_cache: - cache_version: << parameters.clojure_version >> - steps: - - run: clojure -e '(println (System/getProperty "java.runtime.name") (System/getProperty "java.runtime.version") "\nClojure" (clojure-version))' - - run: npm install ws - - kaocha/execute: - args: "clj --reporter documentation --plugin cloverage --codecov" - clojure_version: << parameters.clojure_version >> - - kaocha/execute: - args: "cljs --reporter documentation" - clojure_version: << parameters.clojure_version >> - - kaocha/upload_codecov: - flags: clj - -jobs: - test: - parameters: - os: - type: executor - clojure_version: - type: string - executor: << parameters.os >> - steps: - - checkout_and_run: - clojure_version: << parameters.clojure_version >> - -workflows: - kaocha_test: - jobs: - - test: - matrix: - parameters: - os: [clojure/openjdk19, clojure/openjdk17, clojure/openjdk15, clojure/openjdk11, clojure/openjdk8] - clojure_version: ["1.10.3", "1.11.1"] diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..4ca015e --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,44 @@ +name: Continuous Delivery + +on: push + +jobs: + Kaocha: + runs-on: ${{matrix.sys.os}} + + strategy: + matrix: + sys: + # - { os: macos-latest, shell: bash } + - { os: ubuntu-latest, shell: bash } + # - { os: windows-latest, shell: powershell } + + defaults: + run: + shell: ${{matrix.sys.shell}} + + steps: + - uses: actions/checkout@v2 + + - name: ๐Ÿ”ง Install java + uses: actions/setup-java@v1 + with: + java-version: '25' + + - name: ๐Ÿ”ง Install clojure + uses: DeLaGuardo/setup-clojure@master + with: + cli: '1.12.3.1577' + + - name: ๐Ÿ— maven cache + uses: actions/cache@v4 + with: + path: | + ~/.m2 + ~/.gitlibs + key: ${{ runner.os }}-maven-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: ๐Ÿงช Run tests + run: bin/kaocha diff --git a/README.md b/README.md index 32cf968..6ee031a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # lambdaisland/deep-diff2 -[![CircleCI](https://circleci.com/gh/lambdaisland/deep-diff2.svg?style=svg)](https://circleci.com/gh/lambdaisland/deep-diff2) [![cljdoc badge](https://cljdoc.org/badge/lambdaisland/deep-diff2)](https://cljdoc.org/d/lambdaisland/deep-diff2) [![Clojars Project](https://img.shields.io/clojars/v/lambdaisland/deep-diff2.svg)](https://clojars.org/lambdaisland/deep-diff2) +[![GitHub Actions](https://github.com/lambdaisland/deep-diff2/actions/workflows/main.yml/badge.svg)](https://github.com/lambdaisland/deep-diff2/actions/workflows/main.yml) [![cljdoc badge](https://cljdoc.org/badge/lambdaisland/deep-diff2)](https://cljdoc.org/d/lambdaisland/deep-diff2) [![Clojars Project](https://img.shields.io/clojars/v/lambdaisland/deep-diff2.svg)](https://clojars.org/lambdaisland/deep-diff2) Recursively compare Clojure or ClojureScript data structures, and produce a colorized diff of the result. @@ -294,7 +294,7 @@ Another library that implements a form of data structure diffing is [editscript] ## License -Copyright © 2018-2024 Arne Brasseur and contributors +Copyright © 2018-2025 Arne Brasseur and contributors Available under the terms of the Eclipse Public License 1.0, see LICENSE.txt \ No newline at end of file diff --git a/bb.edn b/bb.edn index 8ee3f87..13a3012 100644 --- a/bb.edn +++ b/bb.edn @@ -1,7 +1,7 @@ {:deps {lambdaisland/deep-diff2 {:local/root "."} lambdaisland/open-source {:git/url "https://github.com/lambdaisland/open-source" - :git/sha "0bd06e00f3b930d9a0fdd0ed90d47a9a333b19da"}} + :git/sha "e0e234aea52aeafac6ebb06c4a5149d83977e6a0"}} :tasks {test:bb {:doc "Run babashka tests with custom runner" :extra-paths ["src" "test"]