From c9011c3f0d2d17c45760e148909326ea449ac1ef Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Mon, 23 Dec 2024 16:16:24 +0900
Subject: [PATCH] Get rid of bash hack on Windows

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 .github/workflows/main.yml | 11 ++++-------
 .gitignore                 |  3 ++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 479db1080..4150acdd4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,8 +15,6 @@ jobs:
         os:
           - macos-latest
           - windows-latest
-        ocaml-compiler:
-          - 5
 
     runs-on: ${{ matrix.os }}
 
@@ -24,20 +22,19 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Use OCaml ${{ matrix.ocaml-compiler }}
+      - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          ocaml-compiler: 5
 
       - name: Install Cap'n Proto (on Windows)
         if: runner.os == 'Windows'
         shell: bash
-        env:
-          CAPNP_VERSION: 1.1.0
-          SHELLOPTS: igncr
         run: |
           curl -LO https://capnproto.org/capnproto-c++-win32-$CAPNP_VERSION.zip && \
           unzip -j capnproto-c++-win32-$CAPNP_VERSION.zip capnproto-tools-win32-$CAPNP_VERSION/capnp.exe -d /usr/bin
+        env:
+          CAPNP_VERSION: 1.1.0
 
       - run: opam install . --deps-only --with-test
 
diff --git a/.gitignore b/.gitignore
index d76c25311..11e8091ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-.merlin
 _build
+_opam
+.merlin
 *.install