Topiary v0.5.1 (#44)

.cargo/config.toml

@@ -1,45 +1,14 @@
 [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"
-replace-with = "vendored-sources"
-
-[source."git+https://github.com/nvim-treesitter/tree-sitter-query"]
-git = "https://github.com/nvim-treesitter/tree-sitter-query"
-replace-with = "vendored-sources"
-
-[source."git+https://github.com/tree-sitter/tree-sitter-bash"]
-git = "https://github.com/tree-sitter/tree-sitter-bash"
-replace-with = "vendored-sources"
-
-[source."git+https://github.com/tree-sitter/tree-sitter-json.git"]
+[source."git+https://github.com/tree-sitter/tree-sitter-json.git?rev=94f5c527b2965465956c2000ed6134dd24daf2a7"]
 git = "https://github.com/tree-sitter/tree-sitter-json.git"
+rev = "94f5c527b2965465956c2000ed6134dd24daf2a7"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/tree-sitter/tree-sitter-ocaml.git"]
+[source."git+https://github.com/tree-sitter/tree-sitter-ocaml.git?rev=036226e5edb410aec004cc7ac0f4b2014dd04a0e"]
 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"]
-git = "https://github.com/tweag/tree-sitter-facade"
-replace-with = "vendored-sources"
-
-[source."git+https://github.com/tweag/web-tree-sitter-sys"]
-git = "https://github.com/tweag/web-tree-sitter-sys"
+rev = "036226e5edb410aec004cc7ac0f4b2014dd04a0e"
 replace-with = "vendored-sources"
 
 [source.vendored-sources]

.github/actions/run-tests/action.yml

@@ -31,6 +31,6 @@ runs:
         diff ${{ inputs.samples }}/expected/ocaml.ml ocaml.ml
         ## Test on OCaml interface files (.mli)
         cat ${{ inputs.samples }}/input/ocaml-interface.mli                    \
-            | ${{ inputs.topiary }} format --language ocaml-interface          \
+            | ${{ inputs.topiary }} format --language ocaml_interface          \
             > ocaml-interface.mli
         diff ${{ inputs.samples }}/expected/ocaml-interface.mli ocaml-interface.mli

.github/workflows/ci.yml

@@ -58,7 +58,6 @@ jobs:
       matrix:
         include:
           - {os: ubuntu}
-          - {os: windows, ef: expected-failure}
           - {os: macos}
 
     runs-on: ${{ matrix.os }}-latest
@@ -93,7 +92,7 @@ jobs:
           printf 'Topiary is: '
           opam exec -- sh -c 'command -v topiary'
           printf 'in version: '
-          opam exec -- topiary --version
+          opam exec -- sh -c 'topiary --version'
           echo '::endgroup::'
 
       - name: Check the outcome of the build
@@ -107,7 +106,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           topiary: opam exec -- topiary
-          samples: topiary/topiary/tests/samples
+          samples: topiary/topiary-cli/tests/samples
 
   docker-based:
     name: docker-based
@@ -121,10 +120,10 @@ jobs:
           - {tag: centos,          ef: expected-failure}
           - {tag: debian,          ef: expected-failure}
           - {tag: debian-testing}
-          - {tag: debian-unstable}
+          - {tag: debian-unstable, ef: expected-failure}
           - {tag: fedora}
           - {tag: oraclelinux}
-          - {tag: opensuse,        ef: expected-failure}
+          - {tag: opensuse}
           - {tag: opensuse-tumbleweed}
           - {tag: ubuntu}
           - {tag: ubuntu-lts}
@@ -161,7 +160,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           topiary: docker run --interactive topiary
-          samples: topiary/topiary/tests/samples
+          samples: topiary/topiary-cli/tests/samples
 
   flake-checks:
     name: flake-checks