Topiary v0.3.0 (#30)

tweag · Oct 31, 2023 · 5e02e26 · 5e02e26
2 parents 6fac87e + 581b531
commit 5e02e26
Show file tree

Hide file tree

Showing 3,552 changed files with 2,818,427 additions and 1,458,531 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,6 +1,10 @@
 [source.crates-io]
 replace-with = "vendored-sources"
 
+[source."git+https://github.com/314eter/tree-sitter-ocamllex.git"]
+git = "https://github.com/314eter/tree-sitter-ocamllex.git"
+replace-with = "vendored-sources"
+
 [source."git+https://github.com/nickel-lang/tree-sitter-nickel?rev=b1a4718601ebd29a62bf3a7fd1069a99ccf48093"]
 git = "https://github.com/nickel-lang/tree-sitter-nickel"
 rev = "b1a4718601ebd29a62bf3a7fd1069a99ccf48093"
@@ -14,8 +18,20 @@ replace-with = "vendored-sources"
 git = "https://github.com/tree-sitter/tree-sitter-bash"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/tree-sitter/tree-sitter-ocaml"]
-git = "https://github.com/tree-sitter/tree-sitter-ocaml"
+[source."git+https://github.com/tree-sitter/tree-sitter-json.git"]
+git = "https://github.com/tree-sitter/tree-sitter-json.git"
+replace-with = "vendored-sources"
+
+[source."git+https://github.com/tree-sitter/tree-sitter-ocaml.git"]
+git = "https://github.com/tree-sitter/tree-sitter-ocaml.git"
+replace-with = "vendored-sources"
+
+[source."git+https://github.com/tree-sitter/tree-sitter-rust.git"]
+git = "https://github.com/tree-sitter/tree-sitter-rust.git"
+replace-with = "vendored-sources"
+
+[source."git+https://github.com/tree-sitter/tree-sitter-toml.git"]
+git = "https://github.com/tree-sitter/tree-sitter-toml.git"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/tweag/tree-sitter-facade"]

diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
@@ -17,7 +17,7 @@ runs:
         ## parse a simple OCaml command and output the right thing.
         echo 'open Foo' > expected.ml
         echo 'open  Foo'                                                       \
-            | ${{ inputs.topiary }} --language ocaml                           \
+            | ${{ inputs.topiary }} format --language ocaml                    \
             > result.ml
         diff expected.ml result.ml
 
@@ -26,11 +26,11 @@ runs:
       run: |
         ## Test on OCaml implementation files (.ml)
         cat ${{ inputs.samples }}/input/ocaml.ml                               \
-            | ${{ inputs.topiary }} --language ocaml                           \
+            | ${{ inputs.topiary }} format --language ocaml                    \
             > ocaml.ml
         diff ${{ inputs.samples }}/expected/ocaml.ml ocaml.ml
         ## Test on OCaml interface files (.mli)
         cat ${{ inputs.samples }}/input/ocaml-interface.mli                    \
-            | ${{ inputs.topiary }} --language ocaml-interface                 \
+            | ${{ inputs.topiary }} format --language ocaml-interface          \
             > ocaml-interface.mli
         diff ${{ inputs.samples }}/expected/ocaml-interface.mli ocaml-interface.mli
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -123,11 +123,11 @@ jobs:
           - {tag: debian-testing}
           - {tag: debian-unstable}
           - {tag: fedora}
-          - {tag: oraclelinux}
+          - {tag: oraclelinux,     ef: expected-failure}
           - {tag: opensuse,        ef: expected-failure}
           - {tag: opensuse-tumbleweed}
-          - {tag: ubuntu}
-          - {tag: ubuntu-lts}
+          - {tag: ubuntu,          ef: expected-failure}
+          - {tag: ubuntu-lts,      ef: expected-failure}
 
     runs-on: ubuntu-latest