diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 91f40e0..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,50 +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))' - # - kaocha/execute: - # args: "unit --reporter documentation --plugin cloverage --codecov" - # clojure_version: << parameters.clojure_version >> - - kaocha/execute: - args: "integration --reporter documentation --plugin cloverage --codecov" - clojure_version: << parameters.clojure_version >> - # - kaocha/upload_codecov: - # flags: unit - - kaocha/upload_codecov: - flags: integration - file: target/coverage/integration*/codecov.json - -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..ee6452c --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,94 @@ +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 + + Codecov: + 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: ๐Ÿงช Generate codecov + run: bin/kaocha --plugin cloverage --codecov + + - name: Upload to codecov + uses: codecov/codecov-action@v5 + with: + #fail_ci_if_error: true + name: codecov-report + files: target/coverage/codecov.json + token: ${{ secrets.CODECOV_TOKEN }} + slug: lambdaisland/kaocha-cljs + verbose: true diff --git a/.gitignore b/.gitignore index 32c86a1..c6f9ff4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ nashorn_code_cache out .store .temp +.lsp/ +.clj-kondo/ diff --git a/README.md b/README.md index e03bff1..87740c0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # kaocha-cljs -[![CircleCI](https://circleci.com/gh/com.lambdaisland/kaocha-cljs.svg?style=svg)](https://circleci.com/gh/com.lambdaisland/kaocha-cljs) [![cljdoc badge](https://cljdoc.org/badge/com.lambdaisland/kaocha-cljs)](https://cljdoc.org/d/com.lambdaisland/kaocha-cljs) [![Clojars Project](https://img.shields.io/clojars/v/com.lambdaisland/kaocha-cljs.svg)](https://clojars.org/com.lambdaisland/kaocha-cljs) +[![GitHub Actions](https://github.com/com.lambdaisland/kaocha-cljs/actions/workflows/main.yml/badge.svg)](https://github.com/com.lambdaisland/kaocha-cljs/actions/workflows/main.yml) [![cljdoc badge](https://cljdoc.org/badge/com.lambdaisland/kaocha-cljs)](https://cljdoc.org/d/com.lambdaisland/kaocha-cljs) [![Clojars Project](https://img.shields.io/clojars/v/com.lambdaisland/kaocha-cljs.svg)](https://clojars.org/com.lambdaisland/kaocha-cljs) ClojureScript support for Kaocha diff --git a/bb.edn b/bb.edn index 44102d0..168e9df 100644 --- a/bb.edn +++ b/bb.edn @@ -1,3 +1,3 @@ {:deps {lambdaisland/open-source {:git/url "https://github.com/lambdaisland/open-source" - :git/sha "8c77e20f6188a30cfcc50c64afb86fa89a9dcb47"}}} + :git/sha "e0e234aea52aeafac6ebb06c4a5149d83977e6a0"}}}