Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 50 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
name: CI

on:
- push
- pull_request
push:
branches:
- 'master'

pull_request:
branches:
- 'master'
env:
ACTIONS_CACHE_VERISON: 0

# TODO: Add the deploy if needed
jobs:
Expand All @@ -29,6 +36,47 @@ jobs:
- name: Run JVM tests
run: bb test:jvm

test-clojureclr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: '8.0.x'

- name: Install ClojureCLR and cljr
run: |
dotnet tool install --global Clojure.Main --version 1.12.3-alpha3
dotnet tool install --global Clojure.Cljr --version 0.1.0-alpha8
echo "$HOME/.dotnet/tools" >> $GITHUB_PATH

- name: Restore dependency cache
id: cache-deps
uses: actions/cache/restore@v4
with:
path: |
~/.gitlibs
key: ${{ env.ACTIONS_CACHE_VERSION }}-clr-deps-${{ hashFiles('**/deps-clr.edn') }}
restore-keys: |
${{ env.ACTIONS_CACHE_VERSION }}-clr-deps-

- name: Download dependencies
if: steps.cache-deps.outputs.cache-hit != 'true'
run: cljr -A:test -Stree

- name: Save dependency cache
if: steps.cache-deps.outputs.cache-hit != 'true'
uses: actions/cache/save@v4
with:
path: |
~/.gitlibs
key: ${{ env.ACTIONS_CACHE_VERSION }}-clr-deps-${{ hashFiles('**/deps-clr.edn') }}

- name: Run CLR tests
run: ./script/test/clr

test-node:
runs-on: ubuntu-latest
steps:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ src/scratch.clj
src/scratch.cljs
.lein-failures
scratch.clj
linux-install.sh
install.sh
install
2 changes: 2 additions & 0 deletions bb.edn
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
:tasks
{test:jvm {:doc "Run CLJ tests with leiningen"
:task (shell "script/test/jvm")}
test:clr {:doc "Run CLR tests with cljr"
:task (shell "script/test/clr")}

test:native {:doc "Run CLJ tests with leiningen"
:task (do (shell "script/compile")
Expand Down
7 changes: 7 additions & 0 deletions deps-clr.edn
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{:paths ["src" "resources"]
:deps {borkdude/edamame {:git/url "https://github.com/borkdude/edamame"
:git/tag "v1.5.33"
:git/sha "f429cf7f44aa83d92f12fd5d52e06387c517a19d"}}
:aliases {:test {:extra-paths ["test"]
:extra-deps {io.github.dmiller/test-runner {:git/tag "v0.5.3clr" :git/sha "ae91dd2727bbf70eb3a6d869a19953de3819dfbc"}}
:main-opts ["-m" "cognitect.test-runner"]}}}
6 changes: 2 additions & 4 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{:paths ["resources" "src"]
:deps {borkdude/edamame {:mvn/version "1.4.32"}
borkdude/sci.impl.reflector {:mvn/version "0.0.5"}
org.babashka/sci.impl.types {:mvn/version "0.0.2"}
borkdude/graal.locking {:mvn/version "0.0.2"}}
:aliases
{:examples {:extra-paths ["examples"]}
:dev {:extra-deps {org.clojure/clojure {:mvn/version "1.12.0"}}
:extra-paths ["reflector/src-java11"]}
:dev {:extra-deps {org.clojure/clojure {:mvn/version "1.12.0"}}}
:test {:extra-paths ["test" "test-resources"]
:extra-deps {org.clojure/clojure {:mvn/version "1.9.0"}
:extra-deps {org.clojure/clojure {:mvn/version "1.10.3"}
org.clojure/clojurescript {:mvn/version "1.11.132"}
clj-commons/conch {:mvn/version "0.9.2"}
funcool/promesa {:mvn/version "8.0.450"}}}
Expand Down
6 changes: 2 additions & 4 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@
:license {:name "Eclipse Public License 1.0"
:url "http://opensource.org/licenses/eclipse-1.0.php"}
:source-paths ["src"]
:dependencies [[org.clojure/clojure "1.9.0"]
[borkdude/sci.impl.reflector "0.0.5"]
:dependencies [[org.clojure/clojure "1.10.3"]
[borkdude/edamame "1.4.32"]
[org.babashka/sci.impl.types "0.0.2"]
[borkdude/graal.locking "0.0.2"]]
:plugins [[lein-codox "0.10.7"]]
:profiles {:clojure-1.9.0 {:dependencies [[org.clojure/clojure "1.9.0"]]}
:clojure-1.10.3 {:depdencies [[org.clojure/clojure "1.10.3"]]}
:profiles {:clojure-1.10.3 {:depdencies [[org.clojure/clojure "1.10.3"]]}
:clojure-1.11.1 {:dependencies [[org.clojure/clojure "1.11.1"]]}
:native-image {:dependencies [[org.clojure/clojure "1.10.3"]]}
:dev {:dependencies [[thheller/shadow-cljs "2.8.64"]]}
Expand Down
1 change: 0 additions & 1 deletion reflector/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions reflector/project.clj

This file was deleted.

3 changes: 0 additions & 3 deletions reflector/script/deploy

This file was deleted.

32 changes: 0 additions & 32 deletions reflector/src/sci/impl/FISupport.java

This file was deleted.

Loading