Skip to content

Commit

Permalink
Merge pull request #310 from smorimoto/remove-win-hack
Browse files Browse the repository at this point in the history
Get rid of bash hack on Windows
  • Loading branch information
talex5 authored Dec 28, 2024
2 parents 28ba000 + c9011c3 commit a9b4e9b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,26 @@ jobs:
os:
- macos-latest
- windows-latest
ocaml-compiler:
- 5

runs-on: ${{ matrix.os }}

steps:
- 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

Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.merlin
_build
_opam
.merlin
*.install

0 comments on commit a9b4e9b

Please sign in to comment.