From 3877db222d0d6735ab8131eaa93dbc708041aa15 Mon Sep 17 00:00:00 2001 From: Joao Paulo Magalhaes Date: Thu, 18 Apr 2024 02:14:23 +0100 Subject: [PATCH] Update rapidyaml to 0.7.0 --- Config.mk | 2 +- ReadMe.md | 34 ++++++++++++------- docker/main/bin/test-yaml-runtimes | 3 +- docker/rapid/Dockerfile | 7 ++-- docker/rapid/bin/yaml-test-parse-rapid | 3 -- docker/rapid/bin/yaml-test-parse-rapid-engine | 3 ++ docker/rapid/bin/yaml-test-parse-rapid-tree | 3 ++ 7 files changed, 35 insertions(+), 20 deletions(-) delete mode 100755 docker/rapid/bin/yaml-test-parse-rapid create mode 100755 docker/rapid/bin/yaml-test-parse-rapid-engine create mode 100755 docker/rapid/bin/yaml-test-parse-rapid-tree diff --git a/Config.mk b/Config.mk index 58b21bb..e760893 100644 --- a/Config.mk +++ b/Config.mk @@ -76,7 +76,7 @@ FROM_PYYAML := yamlio/yaml-test-alpine:$(TAG_ALPINE) $(call add,PYYAML) REPO_RAPID := https://github.com/biojppm/rapidyaml -TAG_RAPID := 0.4.1 +TAG_RAPID := v0.7.0 FROM_RAPID := yamlio/yaml-test-alpine:$(TAG_ALPINE) $(call add,RAPID) diff --git a/ReadMe.md b/ReadMe.md index 2df99d3..fb56fba 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -10,19 +10,21 @@ make build It contains the following YAML parsing test programs and their supporting runtime requirements: -* `yaml-test-parse-dotnet` -- https://github.com/aaubry/YamlDotNet -* `yaml-test-parse-goyaml` -- https://github.com/go-yaml/yaml -* `yaml-test-parse-hsref` -- https://github.com/orenbenkiki/yamlreference -* `yaml-test-parse-hsyaml` -- https://github.com/haskell-hvr/HsYAML -* `yaml-test-parse-libfyaml` -- https://github.com/pantoniou/libfyaml -* `yaml-test-parse-libyaml` -- https://github.com/yaml/libyaml -* `yaml-test-parse-nimyaml` -- https://github.com/flyx/NimYAML -* `yaml-test-parse-npmyaml` -- https://github.com/eemeli/yaml -* `yaml-test-parse-pyyaml` -- https://github.com/yaml/pyyaml -* `yaml-test-parse-ruamel` -- https://pypi.org/project/ruamel.yaml/ -* `yaml-test-parse-snake` -- https://bitbucket.org/snakeyaml/snakeyaml -* `yaml-test-parse-yamlpp` -- https://github.com/perlpunk/YAML-PP-p5 -* `yaml-test-parse-yamlref` -- https://github.com/yaml/yaml-reference-parser +* `yaml-test-parse-dotnet` -- https://github.com/aaubry/YamlDotNet +* `yaml-test-parse-goyaml` -- https://github.com/go-yaml/yaml +* `yaml-test-parse-hsref` -- https://github.com/orenbenkiki/yamlreference +* `yaml-test-parse-hsyaml` -- https://github.com/haskell-hvr/HsYAML +* `yaml-test-parse-libfyaml` -- https://github.com/pantoniou/libfyaml +* `yaml-test-parse-libyaml` -- https://github.com/yaml/libyaml +* `yaml-test-parse-nimyaml` -- https://github.com/flyx/NimYAML +* `yaml-test-parse-npmyaml` -- https://github.com/eemeli/yaml +* `yaml-test-parse-pyyaml` -- https://github.com/yaml/pyyaml +* `yaml-test-parse-rapid-evt` -- https://github.com/biojppm/rapidyaml/ +* `yaml-test-parse-rapid-tree` -- https://github.com/biojppm/rapidyaml/ +* `yaml-test-parse-ruamel` -- https://pypi.org/project/ruamel.yaml/ +* `yaml-test-parse-snake` -- https://bitbucket.org/snakeyaml/snakeyaml +* `yaml-test-parse-yamlpp` -- https://github.com/perlpunk/YAML-PP-p5 +* `yaml-test-parse-yamlref` -- https://github.com/yaml/yaml-reference-parser ## Making the Docker Image @@ -35,6 +37,12 @@ It is based on the latest `alpine` image with the necessary files copied in from the other images. It's currently around 400MB in size. +You can also build an image for an individual processor by going into +the folder of that processor under the [docker folder](./docker); for +example, to build rapidyaml the command is `make -C docker/rapid +build`. + + ## Repository Layout * `Makefile` -- Automates all the tasks. diff --git a/docker/main/bin/test-yaml-runtimes b/docker/main/bin/test-yaml-runtimes index b771169..1f3910d 100755 --- a/docker/main/bin/test-yaml-runtimes +++ b/docker/main/bin/test-yaml-runtimes @@ -15,7 +15,8 @@ testers=" yaml-test-parse-npmyaml yaml-test-parse-ppyaml yaml-test-parse-pyyaml - yaml-test-parse-rapid + yaml-test-parse-rapid-engine + yaml-test-parse-rapid-tree yaml-test-parse-ruamel yaml-test-parse-rustyaml yaml-test-parse-snake diff --git a/docker/rapid/Dockerfile b/docker/rapid/Dockerfile index bc96628..31f5045 100644 --- a/docker/rapid/Dockerfile +++ b/docker/rapid/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /build RUN git init --quiet \ && git remote add origin $REPO \ - && git fetch origin v$TAG \ + && git fetch origin $TAG \ && git reset --hard FETCH_HEAD \ && git submodule update --init --recursive \ && true @@ -37,5 +37,8 @@ RUN cp \ /export/usr/local/bin/ryml-yaml-events \ && true -COPY bin/yaml-test-parse-rapid \ +COPY bin/yaml-test-parse-rapid-engine \ + /export/usr/local/bin/ + +COPY bin/yaml-test-parse-rapid-tree \ /export/usr/local/bin/ diff --git a/docker/rapid/bin/yaml-test-parse-rapid b/docker/rapid/bin/yaml-test-parse-rapid deleted file mode 100755 index a8df6ed..0000000 --- a/docker/rapid/bin/yaml-test-parse-rapid +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -ryml-yaml-events - diff --git a/docker/rapid/bin/yaml-test-parse-rapid-engine b/docker/rapid/bin/yaml-test-parse-rapid-engine new file mode 100755 index 0000000..1b5f58b --- /dev/null +++ b/docker/rapid/bin/yaml-test-parse-rapid-engine @@ -0,0 +1,3 @@ +#!/bin/sh + +ryml-yaml-events -s - diff --git a/docker/rapid/bin/yaml-test-parse-rapid-tree b/docker/rapid/bin/yaml-test-parse-rapid-tree new file mode 100755 index 0000000..b97f2e6 --- /dev/null +++ b/docker/rapid/bin/yaml-test-parse-rapid-tree @@ -0,0 +1,3 @@ +#!/bin/sh + +ryml-yaml-events -t -