Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
allow-prerelease-opam: true

# Until there's a new release of `trace`, we need to pin it.
- run: opam pin https://github.com/c-cube/ocaml-trace.git#HEAD -y -n
- run: opam pin . -y -n
- run: opam install odig imandrakit imandrakit-thread imandrakit-io imandrakit-log
- run: opam exec -- odig odoc --cache-dir=_doc/ imandrakit imandrakit-thread imandrakit-io imandrakit-log
Expand Down
40 changes: 4 additions & 36 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Test
name: Imandrakit CI

on:
push:
Expand All @@ -7,40 +7,8 @@ on:
pull_request:

jobs:
build-all-versions:
name: build
timeout-minutes: 15
strategy:
fail-fast: true
matrix:
os:
- ubuntu-latest
#- macos-latest
#- windows-latest
ocaml-compiler:
- '4.14'

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@main
- name: Use OCaml ${{ matrix.ocaml-compiler }}
uses: ocaml/setup-ocaml@v3
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}
dune-cache: true
allow-prerelease-opam: true

- run: opam pin trace --dev -y -n; opam pin trace-tef --dev -y -n
- run: opam install -t imandrakit imandrakit-log imandrakit-io --deps-only
- run: opam exec -- dune build @install -p imandrakit,imandrakit-log,imandrakit-io
- run: opam exec -- dune build @runtest -p imandrakit,imandrakit-log,imandrakit-io

# install some depopts and build+test again
- run: opam install camlzip
- run: opam exec -- dune build @install @runtest -p imandrakit,imandrakit-log,imandrakit-io

build-ocaml5:
name: build-ocaml5
build:
name: "Build & Test"
timeout-minutes: 15
strategy:
fail-fast: true
Expand All @@ -52,6 +20,7 @@ jobs:
ocaml-compiler:
- '5.1'
- '5.2'
- '5.3'

runs-on: ${{ matrix.os }}
steps:
Expand All @@ -63,7 +32,6 @@ jobs:
dune-cache: true
allow-prerelease-opam: true

- run: opam pin trace --dev -y -n; opam pin trace-tef --dev -y -n
- run: opam install -t imandrakit imandrakit-log imandrakit-io imandrakit-thread --deps-only
- run: opam exec -- dune build @install -p imandrakit,imandrakit-io,imandrakit-log,imandrakit-thread
- run: opam exec -- dune build @runtest -p imandrakit,imandrakit-io,imandrakit-log,imandrakit-thread
Expand Down
4 changes: 2 additions & 2 deletions src/leb128/stubs.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ static inline void ix_leb128_varint(unsigned char *str, uint64_t i) {

// write `i` starting at `idx`
CAMLprim value caml_ix_leb128_varint(value _str, intnat idx, int64_t i) {
char *str = Bytes_val(_str);
unsigned char *str = Bytes_val(_str);
ix_leb128_varint(str + idx, i);
return Val_unit;
}

CAMLprim value caml_ix_leb128_varint_byte(value _str, value _idx, value _i) {
CAMLparam3(_str, _idx, _i);
char *str = Bytes_val(_str);
unsigned char *str = Bytes_val(_str);
int idx = Int_val(_idx);
int64_t i = Int64_val(_i);
ix_leb128_varint(str + idx, i);
Expand Down
3 changes: 2 additions & 1 deletion src/twine-utils/dune
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
(executable
(name main)
(modes (byte exe))
(modes
(byte exe))
(public_name twine_utils)
(package twine-utils)
(preprocess
Expand Down