.github/workflows/ci.yml

@@ -1,8 +1,12 @@
 name: ci
 
 on:
-  - pull_request
-  - push
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - "**" # This will match pull requests targeting any branch
 
 jobs:
   build:
@@ -12,7 +16,7 @@ jobs:
         os:
           - ubuntu-latest
         ocaml-compiler:
-          - 5.2.x
+          - 5.3.x
 
     runs-on: ${{ matrix.os }}
 
@@ -27,8 +31,8 @@ jobs:
           opam-repositories: |
             default: https://github.com/ocaml/opam-repository.git
             mbarbin: https://github.com/mbarbin/opam-repository.git
-#           janestreet-bleeding: https://github.com/janestreet/opam-repository.git
-#           janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
+      #     janestreet-bleeding: https://github.com/janestreet/opam-repository.git
+      #     janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
 
       - name: Install dependencies
         run: opam install . --deps-only --with-doc --with-test --with-dev-setup
@@ -38,8 +42,8 @@ jobs:
 
       - name: Run tests
         run: |
-             mkdir $BISECT_DIR
-             opam exec -- dune runtest --instrument-with bisect_ppx
+          mkdir $BISECT_DIR
+          opam exec -- dune runtest --instrument-with bisect_ppx
         env:
           BISECT_DIR: ${{ runner.temp }}/_bisect_ppx_data
           BISECT_FILE: ${{ runner.temp }}/_bisect_ppx_data/data

.github/workflows/deploy-doc.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Setup OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "5.2.x"
+          ocaml-compiler: "5.3.x"
           opam-repositories: |
             default: https://github.com/ocaml/opam-repository.git
             mbarbin: https://github.com/mbarbin/opam-repository.git

.github/workflows/more-ci.yml

@@ -0,0 +1,60 @@
+# This workflow file is named 'more-ci' and is used to run additional CI checks
+# that complement the main CI workflow. It ensures that our code is tested
+# across multiple operating systems and OCaml compiler versions.
+#
+# Compared to the main 'ci.yml' job, this skips some steps that are not
+# necessary to check for every combination of os and ocaml-compiler, such as
+# generating coverage report, linting odoc, opam and fmt, etc.
+#
+# We prefer to keep it separate from the main CI workflow because we find it
+# more readable, over having too many conditional steps in the same job.
+
+name: more-ci
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - "**" # This will match pull requests targeting any branch
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        ocaml-compiler:
+          - 5.3.x
+          - 5.2.x
+        exclude:
+          # We exclude the combination already tested in the 'ci' workflow.
+          - os: ubuntu-latest
+            ocaml-compiler: 5.3.x
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup OCaml
+        uses: ocaml/setup-ocaml@v3
+        with:
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          opam-repositories: |
+            default: https://github.com/ocaml/opam-repository.git
+            mbarbin: https://github.com/mbarbin/opam-repository.git
+      #     janestreet-bleeding: https://github.com/janestreet/opam-repository.git
+      #     janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
+
+      # We build and run tests for a subset of packages. More tests are run in
+      # the development workflow and as part of the main CI job. These are the
+      # tests that are checked for every combination of os and ocaml-compiler.
+      - name: Install dependencies
+        run: opam install ./vcs.opam ./vcs-base.opam ./vcs-cli.opam ./vcs-git-blocking.opam ./vcs-git-eio.opam ./vcs-git-provider.opam ./vcs-test-helpers.opam ./vcs-tests.opam --deps-only --with-test
+
+      - name: Build & Run tests
+        run: opam exec -- dune build @all @runtest -p vcs,vcs-base,vcs-cli,vcs-git-blocking,vcs-git-eio,vcs-git-provider,vcs-test-helpers,vcs-tests

.github/workflows/test-deploy-doc.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Setup OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "5.2.x"
+          ocaml-compiler: "5.3.x"
           opam-repositories: |
             default: https://github.com/ocaml/opam-repository.git
             mbarbin: https://github.com/mbarbin/opam-repository.git

.ocamlformat

@@ -1,2 +1,4 @@
-version=0.26.2
+version=0.27.0
+ocaml-version=5.2
 profile=janestreet
+parse-docstrings=true

.vscode/settings.json

@@ -5,8 +5,10 @@
         "chdir",
         "ENOENT",
         "fpath",
+        "intf",
         "janestreet",
         "lsplit",
+        "miou",
         "mkdirs",
         "odoc",
         "opam",
@@ -21,4 +23,4 @@
         "worktree",
         "worktrees"
     ]
-}
+}

CHANGES.md

@@ -1,3 +1,24 @@
+## 0.0.11 (unreleased)
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Fixed
+
+- Allow `vcs-git-blocking` calls to be run in parallel (#49, @mbarbin).
+
+### Removed
+
+## 0.0.10 (2024-11-05)
+
+### Changed
+
+- Upgrade to `provider.0.0.11` with breaking changes (#43, @mbarbin).
+- Abstract the trait type constructors (#42, @mbarbin).
+
 ## 0.0.9 (2024-10-23)
 
 ### Added

bin/dune

@@ -1,8 +1,8 @@
 (executable
  (name main)
  (public_name ocaml-vcs)
- (package vcs-command)
+ (package vcs-cli)
  (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a)
- (libraries cmdlang-cmdliner-runner err vcs-command)
+ (libraries cmdlang-cmdliner-runner pp-log.err vcs vcs-cli)
  (instrumentation
   (backend bisect_ppx)))

bin/main.ml

@@ -21,7 +21,7 @@
 
 let () =
   Cmdlang_cmdliner_runner.run
-    Vcs_command.main
+    Vcs_cli.main
     ~name:"ocaml-vcs"
     ~version:"%%VERSION%%"
     ~exn_handler:(function

doc/docs/explanation/dune

@@ -1,6 +1,6 @@
 (mdx
- (package vcs-tests)
+ (package vcs-dev)
  (deps
   (package vcs)
-  (package vcs-command))
+  (package vcs-cli))
  (preludes prelude.txt))

doc/docs/explanation/exploratory_tests.md

@@ -1,6 +1,6 @@
 # Exploratory tests
 
-The `vcs-command` package introduces an executable, `ocaml-vcs`, designed to bring the core functionalities of ocaml-vcs directly to your command line.
+The `vcs-cli` package introduces an executable, `ocaml-vcs`, designed to bring the core functionalities of ocaml-vcs directly to your command line.
 
 It's a practical tool for conducting exploratory testing within your repositories, and reproducing bugs or issues externally, for a smoother debugging process. As a live code sample, it also demonstrates the use of the library.