Rapidyaml

.github/workflows/rapidyaml.yml

@@ -0,0 +1,107 @@
+name: rapidyaml
+
+defaults:
+  run:
+    shell: bash -xeo pipefail {0}
+'on':
+  workflow_dispatch: null
+  push:
+    branches:
+    - main
+  pull_request:
+
+jobs:
+
+  # check that the spec'ed version of rapidyaml passes its own tests
+  ryml:
+    runs-on: ubuntu-24.04
+    if: always()
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - bt: Debug
+        - bt: Release
+    steps:
+    - name: checkout (action)
+      uses: actions/checkout@v4
+      with: {submodules: recursive, fetch-depth: 0} # use fetch-depth to ensure all tags are fetched
+    - name: checkout rapidyaml
+      run: |
+        cd rapidyaml/native
+        make rapidyaml
+    - name: configure
+      run: |
+        cd rapidyaml/native/rapidyaml
+        cmake -B build -D CMAKE_BUILD_TYPE=${{matrix.bt}} -D RYML_BUILD_TESTS=ON
+    - name: build
+      run: |
+        cd rapidyaml/native/rapidyaml
+        cmake --build build --target ryml-test-build --parallel --verbose
+    - name: run tests
+      run: |
+        cd rapidyaml/native/rapidyaml
+        cmake --build build --target ryml-test-run
+
+  # run the c++ tests, also in Debug to test with assertions
+  cpp:
+    runs-on: ubuntu-24.04
+    if: always()
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - bt: Debug
+        - bt: Release
+    steps:
+    - name: checkout (action)
+      uses: actions/checkout@v4
+      with: {submodules: recursive, fetch-depth: 0} # use fetch-depth to ensure all tags are fetched
+    - name: check jni header up to date
+      run: make -C rapidyaml/native -B jni jnicheck
+    - name: get rapidyaml
+      run: make -C rapidyaml/native rapidyaml
+    - name: run c++ tests, static -----------------------------
+      run: echo
+    - name: cfg c++, static
+      run: RAPIDYAML_BUILD_TYPE=${{matrix.bt}} make -C rapidyaml/native cfg-static
+    - name: build c++ tests, static
+      run: RAPIDYAML_BUILD_TYPE=${{matrix.bt}} make -C rapidyaml/native build-static
+    - name: run c++ tests, static
+      run: RAPIDYAML_BUILD_TYPE=${{matrix.bt}} make -C rapidyaml/native test-static
+    - name: run c++ tests, static with timing
+      run: RAPIDYAML_BUILD_TYPE=${{matrix.bt}} make -C rapidyaml/native test-static-timing
+    - name: run c++ tests, shared -----------------------------
+      run: echo
+    - name: cfg c++, shared
+      run: RAPIDYAML_BUILD_TYPE=${{matrix.bt}} make -C rapidyaml/native cfg-shared
+    - name: build c++ tests, shared
+      run: RAPIDYAML_BUILD_TYPE=${{matrix.bt}} make -C rapidyaml/native build-shared
+    - name: run c++ tests, shared
+      run: RAPIDYAML_BUILD_TYPE=${{matrix.bt}} make -C rapidyaml/native test-shared
+    - name: run c++ tests, shared with timing
+      run: RAPIDYAML_BUILD_TYPE=${{matrix.bt}} make -C rapidyaml/native test-shared-timing
+
+  # run the java tests, also in Debug to test with assertions
+  java:
+    runs-on: ubuntu-24.04
+    if: always()
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - bt: Debug
+        - bt: Release
+    steps:
+    - name: checkout (action)
+      uses: actions/checkout@v4
+      with: {submodules: recursive, fetch-depth: 0} # use fetch-depth to ensure all tags are fetched
+    - name: build lib
+      run: RAPIDYAML_BUILD_TYPE=${{matrix.bt}} make -C rapidyaml build
+    - name: build jar
+      run: RAPIDYAML_BUILD_TYPE=${{matrix.bt}} make -C rapidyaml jar
+    - name: run java tests
+      run: RAPIDYAML_BUILD_TYPE=${{matrix.bt}} make -C rapidyaml test

.github/workflows/ys.yml

@@ -0,0 +1,65 @@
+name: ys
+
+defaults:
+  run:
+    shell: bash -xeo pipefail {0}
+'on':
+  workflow_dispatch: null
+  push:
+    branches:
+    - main
+  pull_request:
+
+jobs:
+
+  # run ys tests, also in Debug to test with assertions.
+  # TODO: add a job to do all the downloads and build graalvm, and
+  # then make the other jobs depend on that
+  ys:
+    name: ys/${{matrix.ysparser}}/${{matrix.bt}}
+    runs-on: ubuntu-24.04
+    if: always()
+    continue-on-error: false
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - {v: 1, ysparser: snake}
+        - {v: 1, ysparser: rapid-arr, bt: Debug}
+        - {v: 1, ysparser: rapid-arr, bt: Release}
+        - {v: 1, ysparser: rapid-buf, bt: Debug}
+        - {v: 1, ysparser: rapid-buf, bt: Release}
+    steps:
+    - name: checkout (action)
+      uses: actions/checkout@v4
+      with: {submodules: recursive, fetch-depth: 0} # use fetch-depth to ensure all tags are fetched
+    - name: run core tests
+      run: |
+        . .profile
+        make test-core \
+            v=${{matrix.v}} \
+            YS_TESTING=1 \
+            YS_PARSER=${{matrix.ysparser}} \
+            RAPIDYAML_BUILD_TYPE=${{matrix.bt}}
+    - name: run ys/test-run
+      run: |
+        . .profile
+        make -C ys test-run \
+            v=${{matrix.v}} \
+            YS_PARSER=${{matrix.ysparser}} \
+            RAPIDYAML_BUILD_TYPE=${{matrix.bt}}
+    - name: run test-ys
+      run: |
+        . .profile
+        make test-ys \
+            v=${{matrix.v}} \
+            YS_PARSER=${{matrix.ysparser}} \
+            RAPIDYAML_BUILD_TYPE=${{matrix.bt}}
+    - name: run all tests
+      run: |
+        . .profile
+        make test \
+            v=${{matrix.v}} \
+            YS_TESTING=1 \
+            YS_PARSER=${{matrix.ysparser}} \
+            RAPIDYAML_BUILD_TYPE=${{matrix.bt}}

.gitignore

@@ -1,3 +1,4 @@
+.vimrc
 /*.clj
 /*.md
 *.md.tmp

Makefile

@@ -22,12 +22,14 @@ BINDINGS := \
     rust \
 
 DIRS := \
+    rapidyaml \
     core \
     libyamlscript \
     $(BINDINGS) \
     ys \
 
 BUILD_DIRS := \
+    rapidyaml \
     libyamlscript \
     go \
     nodejs \
@@ -49,9 +51,6 @@ PUBLISH := $(DIRS:%=publish-%)
 CLEAN := $(DIRS:%=clean-%)
 REALCLEAN := $(DIRS:%=realclean-%)
 DISTCLEAN := $(DIRS:%=distclean-%)
-DOCKER_BUILD := $(DIRS:%=docker-build-%)
-DOCKER_TEST := $(DIRS:%=docker-test-%)
-DOCKER_SHELL := $(DIRS:%=docker-shell-%)
 
 export HEAD := $(shell git rev-parse HEAD)
 
@@ -142,7 +141,7 @@ test: $(TEST)
 test-core:
 	$(MAKE) -C core test v=$v
 test-ys:
-	$(MAKE) -C ys test-all v=$v GRAALVM_O=b
+	$(MAKE) -C ys test v=$v GRAALVM_O=b
 test-%: %
 	$(MAKE) -C $< test v=$v GRAALVM_O=b
 test-unit:
@@ -262,7 +261,9 @@ bump: $(BUILD_BIN_YS)
 
 $(CLEAN):
 clean: $(CLEAN)
-	$(RM) -r libyamlscript/lib ys/bin $(MAVEN_REPOSITORY)/yamlscript
+	$(RM) -r $(MAVEN_REPOSITORY)/yamlscript
+	$(RM) -r $(MAVEN_REPOSITORY)/org/yamlscript
+	$(RM) -r libyamlscript/lib ys/bin
 	$(RM) -r libyamlscript-0* ys-0* yamlscript.cli-*.jar
 	$(RM) -r sample/advent/hearsay-rust/target/
 	$(RM) -r homebrew-yamlscript
@@ -289,24 +290,6 @@ distclean-%: %
 	$(MAKE) -C $< distclean
 	$(RM) -r .calva/ .clj-kondo/.cache .lsp/
 
-# XXX Limit removing ~/.m2 to ingy until we can get ~/.m2 to not be used
 sysclean: realclean
 	$(RM) -r $(YS_TMP)
 	$(RM) -r /tmp/yamlscript-* /tmp/ys-local
-ifeq (ingy,$(USER))
-	$(RM) -r $(HOME)/.m2
-endif
-
-$(DOCKER_BUILD):
-docker-build: $(DOCKER_BUILD)
-docker-build-%: %
-	$(MAKE) -C $< docker-build
-
-$(DOCKER_TEST):
-docker-test: $(DOCKER_TEST)
-docker-test-%: %
-	$(MAKE) -C $< docker-test v=$v
-
-$(DOCKER_SHELL):
-docker-shell-%: %
-	$(MAKE) -C $< docker-shell v=$v

clojure/Makefile

@@ -8,7 +8,7 @@ export CLOJARS_PASSWORD ?= $(shell util/get-setting password)
 
 #------------------------------------------------------------------------------
 
-test install deploy:: $(LEIN) $(YAMLSCRIPT_JAVA_INSTALLED)
+test install deploy:: $(LEIN)
 	$< $@
 
 release: deploy

common/base.mk

@@ -41,10 +41,6 @@ chown::
 clean-all::
 	$(MAKE) -C $(ROOT) $@
 
-docker-build::
-
-docker-test::
-
 always:
 
 env::

common/binding.mk

@@ -1,12 +1,11 @@
-include $(COMMON)/docker.mk
+include $(COMMON)/vars-rapidyaml.mk
+include $(COMMON)/vars-libys.mk
 
-test:: $(LIBYAMLSCRIPT_SO_FQNP)
+test:: $(LIBYS_SO_FQNP)
 
-$(LIBYAMLSCRIPT_SO_FQNP): | $(ROOT)/libyamlscript
+$(LIBYS_SO_FQNP): | $(ROOT)/libyamlscript
 	$(MAKE) -C $(ROOT)/libyamlscript build
 
-export PATH := $(BUILD_BIN):$(PATH)
-
 build-doc:: build-bin
 
 build-bin:

common/clojure.mk

@@ -45,7 +45,6 @@ LEIN_REPL_OPTIONS := \
 #------------------------------------------------------------------------------
 
 clean::
-	$(RM) Dockerfile
 	$(RM) -r .lein-*
 	$(RM) -r reports/ target/
 
@@ -128,7 +127,7 @@ ifdef PORT
   repl-port := :port $(PORT)
 endif
 
-.nrepl-pid: $(LEIN)
+.nrepl-pid: $(LEIN) repl-deps
 	( \
 	  $< $(LEIN_REPL_OPTIONS) repl :headless $(repl-port) & \
 	  echo $$! > $@ \