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
20 changes: 2 additions & 18 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ jobs:
- name: Build zlib with musl
run: |
mkdir musl-zlib
filename='zlib-1.3.1.tar.gz'
filename='zlib-1.3.2.tar.gz'
wget "https://zlib.net/$filename"
shasum --check <(echo "f535367b1a11e2f9ac3bec723fb007fbc0d189e5 $filename")
shasum -a 256 --check <(echo "bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16 $filename")
tar -xzf "$filename" -C musl-zlib --strip-components=1
cd musl-zlib
CC=musl-gcc ./configure --libdir=/usr/lib/x86_64-linux-musl --includedir=/usr/include/x86_64-linux-musl
Expand Down Expand Up @@ -87,22 +87,6 @@ jobs:
opam switch set ${{ matrix.ocaml-version }} 2>/dev/null || \
opam switch create ${{ matrix.ocaml-version }} --repos ox=git+https://github.com/oxcaml/opam-repository.git,default

- name: Vendor Basement
run: |
mkdir ../basement
curl -L 'https://github.com/janestreet/basement/archive/c657898128a97dcdfbe4b25d79fd0de2e1e5218f.tar.gz' | \
tar -C ../basement -xz --strip-components=1
git -C ../basement apply $PWD/vendor/basement-semaphore-bug-fix.patch
opam pin basement ../basement

- name: Vendor Core_unix
run: |
mkdir ../core_unix
curl -L 'https://github.com/janestreet/core_unix/archive/63390a3f75376156e77ed49d6cc07ca48a90dd53.tar.gz' | \
tar -C ../core_unix -xz --strip-components=1
git -C ../core_unix apply $PWD/vendor/core-unix-musl-compatibility.patch
opam pin core_unix ../core_unix

- run: opam install ./magic-trace.opam --deps-only --locked

- run: opam install ocamlformat
Expand Down
207 changes: 102 additions & 105 deletions magic-trace.opam.locked
Original file line number Diff line number Diff line change
Expand Up @@ -13,68 +13,66 @@ bug-reports: "https://github.com/janestreet/magic-trace/issues"
depends: [
"angstrom" {= "0.16.1"}
"astring" {= "0.8.5"}
"async" {= "v0.18~preview.130.76+222"}
"async_kernel" {= "v0.18~preview.130.76+222"}
"async_log" {= "v0.18~preview.130.76+222"}
"async_rpc_kernel" {= "v0.18~preview.130.76+222"}
"async_unix" {= "v0.18~preview.130.76+222"}
"base" {= "v0.18~preview.130.76+222"}
"async" {= "v0.18~preview.130.83+317"}
"async_kernel" {= "v0.18~preview.130.83+317"}
"async_log" {= "v0.18~preview.130.83+317"}
"async_rpc_kernel" {= "v0.18~preview.130.83+317"}
"async_unix" {= "v0.18~preview.130.83+317"}
"base" {= "v0.18~preview.130.83+317"}
"base-bigarray" {= "base"}
"base-bytes" {= "base"}
"base-domains" {= "base"}
"base-nnp" {= "base"}
"base-threads" {= "base"}
"base-unix" {= "base"}
"base64" {= "3.5.2"}
"base_bigstring" {= "v0.18~preview.130.76+222"}
"base_quickcheck" {= "v0.18~preview.130.76+222"}
"basement" {= "v0.18~preview.130.76+222"}
"base_bigstring" {= "v0.18~preview.130.83+317"}
"base_quickcheck" {= "v0.18~preview.130.83+317"}
"basement" {= "v0.18~preview.130.83+317"}
"bigarray-compat" {= "1.1.0"}
"bigstringaf" {= "0.10.0"}
"bin_prot" {= "v0.18~preview.130.76+222"}
"bin_prot" {= "v0.18~preview.130.83+317"}
"camlp-streams" {= "5.0.1"}
"camlzip" {= "1.13"}
"capitalization" {= "v0.18~preview.130.76+222"}
"capsule" {= "v0.18~preview.130.76+222"}
"capsule0" {= "v0.18~preview.130.76+222"}
"camlzip" {= "1.14"}
"capitalization" {= "v0.18~preview.130.83+317"}
"capsule" {= "v0.18~preview.130.83+317"}
"capsule0" {= "v0.18~preview.130.83+317"}
"cmdliner" {= "1.3.0"}
"cohttp" {= "5.3.1"}
"cohttp-async" {= "5.3.0"}
"cohttp_static_handler" {= "v0.18~preview.130.76+222"}
"cohttp_static_handler" {= "v0.18~preview.130.83+317"}
"conduit" {= "8.0.0"}
"conduit-async" {= "8.0.0"}
"conf-autoconf" {= "0.2"}
"conf-pkg-config" {= "4"}
"conf-which" {= "1"}
"conf-zlib" {= "1"}
"conf-zstd" {= "1.3.8"}
"core" {= "v0.18~preview.130.76+222"}
"core_extended" {= "v0.18~preview.130.76+222"}
"core_kernel" {= "v0.18~preview.130.76+222"}
"core_unix" {= "v0.18~preview.130.76+222"}
"cppo" {= "1.8.0"}
"core" {= "v0.18~preview.130.83+317"}
"core_extended" {= "v0.18~preview.130.83+317"}
"core_kernel" {= "v0.18~preview.130.83+317"}
"core_unix" {= "v0.18~preview.130.83+317"}
"crunch" {= "4.0.0"}
"csexp" {= "1.5.2"}
"cstruct" {= "6.2.0"}
"ctypes" {= "0.23.0+ox"}
"domain-name" {= "0.5.0"}
"dune" {= "3.20.2+ox"}
"dune-configurator" {= "3.20.2"}
"expect_test_helpers_async" {= "v0.18~preview.130.76+222"}
"expect_test_helpers_core" {= "v0.18~preview.130.76+222"}
"fieldslib" {= "v0.18~preview.130.76+222"}
"flexible_sexp" {= "v0.18~preview.130.76+222"}
"dune" {= "3.21.1"}
"dune-configurator" {= "3.21.1"}
"expect_test_helpers_async" {= "v0.18~preview.130.83+317"}
"expect_test_helpers_core" {= "v0.18~preview.130.83+317"}
"fieldslib" {= "v0.18~preview.130.83+317"}
"flexible_sexp" {= "v0.18~preview.130.83+317"}
"fmt" {= "0.10.0"}
"int_repr" {= "v0.18~preview.130.76+222"}
"int_repr" {= "v0.18~preview.130.83+317"}
"integers" {= "0.7.0"}
"ipaddr" {= "5.6.1"}
"ipaddr-sexp" {= "5.6.1"}
"jane-street-headers" {= "v0.18~preview.130.76+222"}
"ipaddr" {= "5.6.2"}
"ipaddr-sexp" {= "5.6.2"}
"jane-street-headers" {= "v0.18~preview.130.83+317"}
"jsonm" {= "1.0.2"}
"jst-config" {= "v0.18~preview.130.76+222"}
"jst-config" {= "v0.18~preview.130.83+317"}
"logs" {= "0.9.0"}
"lwt" {= "5.9.2+ox"}
"macaddr" {= "5.6.1"}
"macaddr" {= "5.6.2"}
"magic-mime" {= "1.3.1"}
"num" {= "1.6"}
"ocaml" {= "5.2.0"}
Expand All @@ -83,95 +81,94 @@ depends: [
"ocaml-options-vanilla" {= "1"}
"ocaml-syntax-shims" {= "1.0.0"}
"ocaml-variants" {= "5.2.0+ox"}
"ocaml_intrinsics" {= "v0.18~preview.130.76+222"}
"ocaml_intrinsics_kernel" {= "v0.18~preview.130.76+222"}
"ocaml_intrinsics" {= "v0.18~preview.130.83+317"}
"ocaml_intrinsics_kernel" {= "v0.18~preview.130.83+317"}
"ocamlbuild" {= "0.15.0+ox"}
"ocamlfind" {= "1.9.8"}
"ocplib-endian" {= "1.2"}
"ocamlfind" {= "1.9.8+ox"}
"odoc-parser" {= "3.1.0+ox"}
"owee" {= "0.8"}
"parsexp" {= "v0.18~preview.130.76+222"}
"pipe_with_writer_error" {= "v0.18~preview.130.76+222"}
"portable" {= "v0.18~preview.130.76+222"}
"ppx_array_base" {= "v0.18~preview.130.76+222"}
"ppx_assert" {= "v0.18~preview.130.76+222"}
"ppx_base" {= "v0.18~preview.130.76+222"}
"ppx_bench" {= "v0.18~preview.130.76+222"}
"ppx_bin_prot" {= "v0.18~preview.130.76+222"}
"ppx_cold" {= "v0.18~preview.130.76+222"}
"ppx_compare" {= "v0.18~preview.130.76+222"}
"ppx_custom_printf" {= "v0.18~preview.130.76+222"}
"ppx_debug_assert" {= "v0.18~preview.130.76+222"}
"parsexp" {= "v0.18~preview.130.83+317"}
"pipe_with_writer_error" {= "v0.18~preview.130.83+317"}
"portable" {= "v0.18~preview.130.83+317"}
"ppx_array_base" {= "v0.18~preview.130.83+317"}
"ppx_assert" {= "v0.18~preview.130.83+317"}
"ppx_base" {= "v0.18~preview.130.83+317"}
"ppx_bench" {= "v0.18~preview.130.83+317"}
"ppx_bin_prot" {= "v0.18~preview.130.83+317"}
"ppx_cold" {= "v0.18~preview.130.83+317"}
"ppx_compare" {= "v0.18~preview.130.83+317"}
"ppx_custom_printf" {= "v0.18~preview.130.83+317"}
"ppx_debug_assert" {= "v0.18~preview.130.83+317"}
"ppx_derivers" {= "1.2.1"}
"ppx_diff" {= "v0.18~preview.130.76+222"}
"ppx_disable_unused_warnings" {= "v0.18~preview.130.76+222"}
"ppx_enumerate" {= "v0.18~preview.130.76+222"}
"ppx_expect" {= "v0.18~preview.130.76+222"}
"ppx_fields_conv" {= "v0.18~preview.130.76+222"}
"ppx_fixed_literal" {= "v0.18~preview.130.76+222"}
"ppx_fuelproof" {= "v0.18~preview.130.76+222"}
"ppx_globalize" {= "v0.18~preview.130.76+222"}
"ppx_hash" {= "v0.18~preview.130.76+222"}
"ppx_helpers" {= "v0.18~preview.130.76+222"}
"ppx_here" {= "v0.18~preview.130.76+222"}
"ppx_ignore_instrumentation" {= "v0.18~preview.130.76+222"}
"ppx_inline_test" {= "v0.18~preview.130.76+222"}
"ppx_int63_literal" {= "v0.18~preview.130.76+222"}
"ppx_jane" {= "v0.18~preview.130.76+222"}
"ppx_js_style" {= "v0.18~preview.130.76+222"}
"ppx_let" {= "v0.18~preview.130.76+222"}
"ppx_log" {= "v0.18~preview.130.76+222"}
"ppx_module_timer" {= "v0.18~preview.130.76+222"}
"ppx_optcomp" {= "v0.18~preview.130.76+222"}
"ppx_optional" {= "v0.18~preview.130.76+222"}
"ppx_pipebang" {= "v0.18~preview.130.76+222"}
"ppx_portable" {= "v0.18~preview.130.76+222"}
"ppx_sexp_conv" {= "v0.18~preview.130.76+222"}
"ppx_sexp_message" {= "v0.18~preview.130.76+222"}
"ppx_sexp_value" {= "v0.18~preview.130.76+222"}
"ppx_shorthand" {= "v0.18~preview.130.76+222"}
"ppx_stable" {= "v0.18~preview.130.76+222"}
"ppx_stable_witness" {= "v0.18~preview.130.76+222"}
"ppx_string" {= "v0.18~preview.130.76+222"}
"ppx_string_conv" {= "v0.18~preview.130.76+222"}
"ppx_template" {= "v0.18~preview.130.76+222"}
"ppx_tydi" {= "v0.18~preview.130.76+222"}
"ppx_typed_fields" {= "v0.18~preview.130.76+222"}
"ppx_typerep_conv" {= "v0.18~preview.130.76+222"}
"ppx_var_name" {= "v0.18~preview.130.76+222"}
"ppx_variants_conv" {= "v0.18~preview.130.76+222"}
"ppx_diff" {= "v0.18~preview.130.83+317"}
"ppx_disable_unused_warnings" {= "v0.18~preview.130.83+317"}
"ppx_enumerate" {= "v0.18~preview.130.83+317"}
"ppx_expect" {= "v0.18~preview.130.83+317"}
"ppx_fields_conv" {= "v0.18~preview.130.83+317"}
"ppx_fixed_literal" {= "v0.18~preview.130.83+317"}
"ppx_fuelproof" {= "v0.18~preview.130.83+317"}
"ppx_globalize" {= "v0.18~preview.130.83+317"}
"ppx_hash" {= "v0.18~preview.130.83+317"}
"ppx_helpers" {= "v0.18~preview.130.83+317"}
"ppx_here" {= "v0.18~preview.130.83+317"}
"ppx_ignore_instrumentation" {= "v0.18~preview.130.83+317"}
"ppx_inline_test" {= "v0.18~preview.130.83+317"}
"ppx_int63_literal" {= "v0.18~preview.130.83+317"}
"ppx_jane" {= "v0.18~preview.130.83+317"}
"ppx_js_style" {= "v0.18~preview.130.83+317"}
"ppx_let" {= "v0.18~preview.130.83+317"}
"ppx_log" {= "v0.18~preview.130.83+317"}
"ppx_module_timer" {= "v0.18~preview.130.83+317"}
"ppx_optcomp" {= "v0.18~preview.130.83+317"}
"ppx_optional" {= "v0.18~preview.130.83+317"}
"ppx_pipebang" {= "v0.18~preview.130.83+317"}
"ppx_portable" {= "v0.18~preview.130.83+317"}
"ppx_sexp_conv" {= "v0.18~preview.130.83+317"}
"ppx_sexp_message" {= "v0.18~preview.130.83+317"}
"ppx_sexp_value" {= "v0.18~preview.130.83+317"}
"ppx_shorthand" {= "v0.18~preview.130.83+317"}
"ppx_stable" {= "v0.18~preview.130.83+317"}
"ppx_stable_witness" {= "v0.18~preview.130.83+317"}
"ppx_string" {= "v0.18~preview.130.83+317"}
"ppx_string_conv" {= "v0.18~preview.130.83+317"}
"ppx_template" {= "v0.18~preview.130.83+317"}
"ppx_tydi" {= "v0.18~preview.130.83+317"}
"ppx_typed_fields" {= "v0.18~preview.130.83+317"}
"ppx_typerep_conv" {= "v0.18~preview.130.83+317"}
"ppx_var_name" {= "v0.18~preview.130.83+317"}
"ppx_variants_conv" {= "v0.18~preview.130.83+317"}
"ppxlib" {= "0.33.0+ox"}
"ppxlib_ast" {= "0.33.0+ox"}
"ppxlib_jane" {= "v0.18~preview.130.76+222"}
"protocol_version_header" {= "v0.18~preview.130.76+222"}
"ppxlib_jane" {= "v0.18~preview.130.83+317"}
"protocol_version_header" {= "v0.18~preview.130.83+317"}
"ptime" {= "1.2.0"}
"re" {= "1.14.0+ox"}
"record_builder" {= "v0.18~preview.130.76+222"}
"record_builder" {= "v0.18~preview.130.83+317"}
"result" {= "1.5"}
"seq" {= "base"}
"sexp_pretty" {= "v0.18~preview.130.76+222"}
"sexp_type" {= "v0.18~preview.130.76+222"}
"sexplib" {= "v0.18~preview.130.76+222"}
"sexplib0" {= "v0.18~preview.130.76+222"}
"shell" {= "v0.18~preview.130.76+222"}
"sexp_pretty" {= "v0.18~preview.130.83+317"}
"sexp_type" {= "v0.18~preview.130.83+317"}
"sexplib" {= "v0.18~preview.130.83+317"}
"sexplib0" {= "v0.18~preview.130.83+317"}
"shell" {= "v0.18~preview.130.83+317"}
"spawn" {= "v0.15.1+ox"}
"splittable_random" {= "v0.18~preview.130.76+222"}
"stdio" {= "v0.18~preview.130.76+222"}
"splittable_random" {= "v0.18~preview.130.83+317"}
"stdio" {= "v0.18~preview.130.83+317"}
"stdlib-shims" {= "0.3.0"}
"string_dict" {= "v0.18~preview.130.76+222"}
"string_dict" {= "v0.18~preview.130.83+317"}
"stringext" {= "1.6.0"}
"textutils" {= "v0.18~preview.130.76+222"}
"time_now" {= "v0.18~preview.130.76+222"}
"textutils" {= "v0.18~preview.130.83+317"}
"time_now" {= "v0.18~preview.130.83+317"}
"topkg" {= "1.0.8+ox"}
"typerep" {= "v0.18~preview.130.76+222"}
"unique" {= "v0.18~preview.130.76+222"}
"univ_map" {= "v0.18~preview.130.76+222"}
"uopt" {= "v0.18~preview.130.76+222"}
"typerep" {= "v0.18~preview.130.83+317"}
"unique" {= "v0.18~preview.130.83+317"}
"univ_map" {= "v0.18~preview.130.83+317"}
"uopt" {= "v0.18~preview.130.83+317"}
"uri" {= "4.4.0"}
"uri-sexp" {= "4.4.0"}
"uutf" {= "1.0.3+ox"}
"variantslib" {= "v0.18~preview.130.76+222"}
"zstandard" {= "v0.18~preview.130.76+222"}
"variantslib" {= "v0.18~preview.130.83+317"}
"zstandard" {= "v0.18~preview.130.83+317"}
]
build: ["dune" "build" "-p" name "-j" jobs]
dev-repo: "git+https://github.com/janestreet/magic-trace.git"
Loading