Skip to content

Commit d31ceba

Browse files
Svetlitskicgaebel
Svetlitski
authored and
cgaebel
committed
Update dependencies to fix GitHub actions
Update `zlib` version and our OxCaml dependencies to fix GitHub Actions build. Signed-off-by: Kevin Svetlitski <ksvetlitski@janestreet.com>
1 parent fdf8c2b commit d31ceba

File tree

2 files changed

+104
-123
lines changed

2 files changed

+104
-123
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ jobs:
5050
- name: Build zlib with musl
5151
run: |
5252
mkdir musl-zlib
53-
filename='zlib-1.3.1.tar.gz'
53+
filename='zlib-1.3.2.tar.gz'
5454
wget "https://zlib.net/$filename"
55-
shasum --check <(echo "f535367b1a11e2f9ac3bec723fb007fbc0d189e5 $filename")
55+
shasum -a 256 --check <(echo "bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16 $filename")
5656
tar -xzf "$filename" -C musl-zlib --strip-components=1
5757
cd musl-zlib
5858
CC=musl-gcc ./configure --libdir=/usr/lib/x86_64-linux-musl --includedir=/usr/include/x86_64-linux-musl
@@ -87,22 +87,6 @@ jobs:
8787
opam switch set ${{ matrix.ocaml-version }} 2>/dev/null || \
8888
opam switch create ${{ matrix.ocaml-version }} --repos ox=git+https://github.com/oxcaml/opam-repository.git,default
8989
90-
- name: Vendor Basement
91-
run: |
92-
mkdir ../basement
93-
curl -L 'https://github.com/janestreet/basement/archive/c657898128a97dcdfbe4b25d79fd0de2e1e5218f.tar.gz' | \
94-
tar -C ../basement -xz --strip-components=1
95-
git -C ../basement apply $PWD/vendor/basement-semaphore-bug-fix.patch
96-
opam pin basement ../basement
97-
98-
- name: Vendor Core_unix
99-
run: |
100-
mkdir ../core_unix
101-
curl -L 'https://github.com/janestreet/core_unix/archive/63390a3f75376156e77ed49d6cc07ca48a90dd53.tar.gz' | \
102-
tar -C ../core_unix -xz --strip-components=1
103-
git -C ../core_unix apply $PWD/vendor/core-unix-musl-compatibility.patch
104-
opam pin core_unix ../core_unix
105-
10690
- run: opam install ./magic-trace.opam --deps-only --locked
10791

10892
- run: opam install ocamlformat

‎magic-trace.opam.locked‎

Lines changed: 102 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -13,68 +13,66 @@ bug-reports: "https://github.com/janestreet/magic-trace/issues"
1313
depends: [
1414
"angstrom" {= "0.16.1"}
1515
"astring" {= "0.8.5"}
16-
"async" {= "v0.18~preview.130.76+222"}
17-
"async_kernel" {= "v0.18~preview.130.76+222"}
18-
"async_log" {= "v0.18~preview.130.76+222"}
19-
"async_rpc_kernel" {= "v0.18~preview.130.76+222"}
20-
"async_unix" {= "v0.18~preview.130.76+222"}
21-
"base" {= "v0.18~preview.130.76+222"}
16+
"async" {= "v0.18~preview.130.83+317"}
17+
"async_kernel" {= "v0.18~preview.130.83+317"}
18+
"async_log" {= "v0.18~preview.130.83+317"}
19+
"async_rpc_kernel" {= "v0.18~preview.130.83+317"}
20+
"async_unix" {= "v0.18~preview.130.83+317"}
21+
"base" {= "v0.18~preview.130.83+317"}
2222
"base-bigarray" {= "base"}
2323
"base-bytes" {= "base"}
2424
"base-domains" {= "base"}
2525
"base-nnp" {= "base"}
2626
"base-threads" {= "base"}
2727
"base-unix" {= "base"}
2828
"base64" {= "3.5.2"}
29-
"base_bigstring" {= "v0.18~preview.130.76+222"}
30-
"base_quickcheck" {= "v0.18~preview.130.76+222"}
31-
"basement" {= "v0.18~preview.130.76+222"}
29+
"base_bigstring" {= "v0.18~preview.130.83+317"}
30+
"base_quickcheck" {= "v0.18~preview.130.83+317"}
31+
"basement" {= "v0.18~preview.130.83+317"}
3232
"bigarray-compat" {= "1.1.0"}
3333
"bigstringaf" {= "0.10.0"}
34-
"bin_prot" {= "v0.18~preview.130.76+222"}
34+
"bin_prot" {= "v0.18~preview.130.83+317"}
3535
"camlp-streams" {= "5.0.1"}
36-
"camlzip" {= "1.13"}
37-
"capitalization" {= "v0.18~preview.130.76+222"}
38-
"capsule" {= "v0.18~preview.130.76+222"}
39-
"capsule0" {= "v0.18~preview.130.76+222"}
36+
"camlzip" {= "1.14"}
37+
"capitalization" {= "v0.18~preview.130.83+317"}
38+
"capsule" {= "v0.18~preview.130.83+317"}
39+
"capsule0" {= "v0.18~preview.130.83+317"}
4040
"cmdliner" {= "1.3.0"}
4141
"cohttp" {= "5.3.1"}
4242
"cohttp-async" {= "5.3.0"}
43-
"cohttp_static_handler" {= "v0.18~preview.130.76+222"}
43+
"cohttp_static_handler" {= "v0.18~preview.130.83+317"}
4444
"conduit" {= "8.0.0"}
4545
"conduit-async" {= "8.0.0"}
4646
"conf-autoconf" {= "0.2"}
4747
"conf-pkg-config" {= "4"}
4848
"conf-which" {= "1"}
4949
"conf-zlib" {= "1"}
5050
"conf-zstd" {= "1.3.8"}
51-
"core" {= "v0.18~preview.130.76+222"}
52-
"core_extended" {= "v0.18~preview.130.76+222"}
53-
"core_kernel" {= "v0.18~preview.130.76+222"}
54-
"core_unix" {= "v0.18~preview.130.76+222"}
55-
"cppo" {= "1.8.0"}
51+
"core" {= "v0.18~preview.130.83+317"}
52+
"core_extended" {= "v0.18~preview.130.83+317"}
53+
"core_kernel" {= "v0.18~preview.130.83+317"}
54+
"core_unix" {= "v0.18~preview.130.83+317"}
5655
"crunch" {= "4.0.0"}
5756
"csexp" {= "1.5.2"}
5857
"cstruct" {= "6.2.0"}
5958
"ctypes" {= "0.23.0+ox"}
6059
"domain-name" {= "0.5.0"}
61-
"dune" {= "3.20.2+ox"}
62-
"dune-configurator" {= "3.20.2"}
63-
"expect_test_helpers_async" {= "v0.18~preview.130.76+222"}
64-
"expect_test_helpers_core" {= "v0.18~preview.130.76+222"}
65-
"fieldslib" {= "v0.18~preview.130.76+222"}
66-
"flexible_sexp" {= "v0.18~preview.130.76+222"}
60+
"dune" {= "3.21.1"}
61+
"dune-configurator" {= "3.21.1"}
62+
"expect_test_helpers_async" {= "v0.18~preview.130.83+317"}
63+
"expect_test_helpers_core" {= "v0.18~preview.130.83+317"}
64+
"fieldslib" {= "v0.18~preview.130.83+317"}
65+
"flexible_sexp" {= "v0.18~preview.130.83+317"}
6766
"fmt" {= "0.10.0"}
68-
"int_repr" {= "v0.18~preview.130.76+222"}
67+
"int_repr" {= "v0.18~preview.130.83+317"}
6968
"integers" {= "0.7.0"}
70-
"ipaddr" {= "5.6.1"}
71-
"ipaddr-sexp" {= "5.6.1"}
72-
"jane-street-headers" {= "v0.18~preview.130.76+222"}
69+
"ipaddr" {= "5.6.2"}
70+
"ipaddr-sexp" {= "5.6.2"}
71+
"jane-street-headers" {= "v0.18~preview.130.83+317"}
7372
"jsonm" {= "1.0.2"}
74-
"jst-config" {= "v0.18~preview.130.76+222"}
73+
"jst-config" {= "v0.18~preview.130.83+317"}
7574
"logs" {= "0.9.0"}
76-
"lwt" {= "5.9.2+ox"}
77-
"macaddr" {= "5.6.1"}
75+
"macaddr" {= "5.6.2"}
7876
"magic-mime" {= "1.3.1"}
7977
"num" {= "1.6"}
8078
"ocaml" {= "5.2.0"}
@@ -83,95 +81,94 @@ depends: [
8381
"ocaml-options-vanilla" {= "1"}
8482
"ocaml-syntax-shims" {= "1.0.0"}
8583
"ocaml-variants" {= "5.2.0+ox"}
86-
"ocaml_intrinsics" {= "v0.18~preview.130.76+222"}
87-
"ocaml_intrinsics_kernel" {= "v0.18~preview.130.76+222"}
84+
"ocaml_intrinsics" {= "v0.18~preview.130.83+317"}
85+
"ocaml_intrinsics_kernel" {= "v0.18~preview.130.83+317"}
8886
"ocamlbuild" {= "0.15.0+ox"}
89-
"ocamlfind" {= "1.9.8"}
90-
"ocplib-endian" {= "1.2"}
87+
"ocamlfind" {= "1.9.8+ox"}
9188
"odoc-parser" {= "3.1.0+ox"}
9289
"owee" {= "0.8"}
93-
"parsexp" {= "v0.18~preview.130.76+222"}
94-
"pipe_with_writer_error" {= "v0.18~preview.130.76+222"}
95-
"portable" {= "v0.18~preview.130.76+222"}
96-
"ppx_array_base" {= "v0.18~preview.130.76+222"}
97-
"ppx_assert" {= "v0.18~preview.130.76+222"}
98-
"ppx_base" {= "v0.18~preview.130.76+222"}
99-
"ppx_bench" {= "v0.18~preview.130.76+222"}
100-
"ppx_bin_prot" {= "v0.18~preview.130.76+222"}
101-
"ppx_cold" {= "v0.18~preview.130.76+222"}
102-
"ppx_compare" {= "v0.18~preview.130.76+222"}
103-
"ppx_custom_printf" {= "v0.18~preview.130.76+222"}
104-
"ppx_debug_assert" {= "v0.18~preview.130.76+222"}
90+
"parsexp" {= "v0.18~preview.130.83+317"}
91+
"pipe_with_writer_error" {= "v0.18~preview.130.83+317"}
92+
"portable" {= "v0.18~preview.130.83+317"}
93+
"ppx_array_base" {= "v0.18~preview.130.83+317"}
94+
"ppx_assert" {= "v0.18~preview.130.83+317"}
95+
"ppx_base" {= "v0.18~preview.130.83+317"}
96+
"ppx_bench" {= "v0.18~preview.130.83+317"}
97+
"ppx_bin_prot" {= "v0.18~preview.130.83+317"}
98+
"ppx_cold" {= "v0.18~preview.130.83+317"}
99+
"ppx_compare" {= "v0.18~preview.130.83+317"}
100+
"ppx_custom_printf" {= "v0.18~preview.130.83+317"}
101+
"ppx_debug_assert" {= "v0.18~preview.130.83+317"}
105102
"ppx_derivers" {= "1.2.1"}
106-
"ppx_diff" {= "v0.18~preview.130.76+222"}
107-
"ppx_disable_unused_warnings" {= "v0.18~preview.130.76+222"}
108-
"ppx_enumerate" {= "v0.18~preview.130.76+222"}
109-
"ppx_expect" {= "v0.18~preview.130.76+222"}
110-
"ppx_fields_conv" {= "v0.18~preview.130.76+222"}
111-
"ppx_fixed_literal" {= "v0.18~preview.130.76+222"}
112-
"ppx_fuelproof" {= "v0.18~preview.130.76+222"}
113-
"ppx_globalize" {= "v0.18~preview.130.76+222"}
114-
"ppx_hash" {= "v0.18~preview.130.76+222"}
115-
"ppx_helpers" {= "v0.18~preview.130.76+222"}
116-
"ppx_here" {= "v0.18~preview.130.76+222"}
117-
"ppx_ignore_instrumentation" {= "v0.18~preview.130.76+222"}
118-
"ppx_inline_test" {= "v0.18~preview.130.76+222"}
119-
"ppx_int63_literal" {= "v0.18~preview.130.76+222"}
120-
"ppx_jane" {= "v0.18~preview.130.76+222"}
121-
"ppx_js_style" {= "v0.18~preview.130.76+222"}
122-
"ppx_let" {= "v0.18~preview.130.76+222"}
123-
"ppx_log" {= "v0.18~preview.130.76+222"}
124-
"ppx_module_timer" {= "v0.18~preview.130.76+222"}
125-
"ppx_optcomp" {= "v0.18~preview.130.76+222"}
126-
"ppx_optional" {= "v0.18~preview.130.76+222"}
127-
"ppx_pipebang" {= "v0.18~preview.130.76+222"}
128-
"ppx_portable" {= "v0.18~preview.130.76+222"}
129-
"ppx_sexp_conv" {= "v0.18~preview.130.76+222"}
130-
"ppx_sexp_message" {= "v0.18~preview.130.76+222"}
131-
"ppx_sexp_value" {= "v0.18~preview.130.76+222"}
132-
"ppx_shorthand" {= "v0.18~preview.130.76+222"}
133-
"ppx_stable" {= "v0.18~preview.130.76+222"}
134-
"ppx_stable_witness" {= "v0.18~preview.130.76+222"}
135-
"ppx_string" {= "v0.18~preview.130.76+222"}
136-
"ppx_string_conv" {= "v0.18~preview.130.76+222"}
137-
"ppx_template" {= "v0.18~preview.130.76+222"}
138-
"ppx_tydi" {= "v0.18~preview.130.76+222"}
139-
"ppx_typed_fields" {= "v0.18~preview.130.76+222"}
140-
"ppx_typerep_conv" {= "v0.18~preview.130.76+222"}
141-
"ppx_var_name" {= "v0.18~preview.130.76+222"}
142-
"ppx_variants_conv" {= "v0.18~preview.130.76+222"}
103+
"ppx_diff" {= "v0.18~preview.130.83+317"}
104+
"ppx_disable_unused_warnings" {= "v0.18~preview.130.83+317"}
105+
"ppx_enumerate" {= "v0.18~preview.130.83+317"}
106+
"ppx_expect" {= "v0.18~preview.130.83+317"}
107+
"ppx_fields_conv" {= "v0.18~preview.130.83+317"}
108+
"ppx_fixed_literal" {= "v0.18~preview.130.83+317"}
109+
"ppx_fuelproof" {= "v0.18~preview.130.83+317"}
110+
"ppx_globalize" {= "v0.18~preview.130.83+317"}
111+
"ppx_hash" {= "v0.18~preview.130.83+317"}
112+
"ppx_helpers" {= "v0.18~preview.130.83+317"}
113+
"ppx_here" {= "v0.18~preview.130.83+317"}
114+
"ppx_ignore_instrumentation" {= "v0.18~preview.130.83+317"}
115+
"ppx_inline_test" {= "v0.18~preview.130.83+317"}
116+
"ppx_int63_literal" {= "v0.18~preview.130.83+317"}
117+
"ppx_jane" {= "v0.18~preview.130.83+317"}
118+
"ppx_js_style" {= "v0.18~preview.130.83+317"}
119+
"ppx_let" {= "v0.18~preview.130.83+317"}
120+
"ppx_log" {= "v0.18~preview.130.83+317"}
121+
"ppx_module_timer" {= "v0.18~preview.130.83+317"}
122+
"ppx_optcomp" {= "v0.18~preview.130.83+317"}
123+
"ppx_optional" {= "v0.18~preview.130.83+317"}
124+
"ppx_pipebang" {= "v0.18~preview.130.83+317"}
125+
"ppx_portable" {= "v0.18~preview.130.83+317"}
126+
"ppx_sexp_conv" {= "v0.18~preview.130.83+317"}
127+
"ppx_sexp_message" {= "v0.18~preview.130.83+317"}
128+
"ppx_sexp_value" {= "v0.18~preview.130.83+317"}
129+
"ppx_shorthand" {= "v0.18~preview.130.83+317"}
130+
"ppx_stable" {= "v0.18~preview.130.83+317"}
131+
"ppx_stable_witness" {= "v0.18~preview.130.83+317"}
132+
"ppx_string" {= "v0.18~preview.130.83+317"}
133+
"ppx_string_conv" {= "v0.18~preview.130.83+317"}
134+
"ppx_template" {= "v0.18~preview.130.83+317"}
135+
"ppx_tydi" {= "v0.18~preview.130.83+317"}
136+
"ppx_typed_fields" {= "v0.18~preview.130.83+317"}
137+
"ppx_typerep_conv" {= "v0.18~preview.130.83+317"}
138+
"ppx_var_name" {= "v0.18~preview.130.83+317"}
139+
"ppx_variants_conv" {= "v0.18~preview.130.83+317"}
143140
"ppxlib" {= "0.33.0+ox"}
144141
"ppxlib_ast" {= "0.33.0+ox"}
145-
"ppxlib_jane" {= "v0.18~preview.130.76+222"}
146-
"protocol_version_header" {= "v0.18~preview.130.76+222"}
142+
"ppxlib_jane" {= "v0.18~preview.130.83+317"}
143+
"protocol_version_header" {= "v0.18~preview.130.83+317"}
147144
"ptime" {= "1.2.0"}
148145
"re" {= "1.14.0+ox"}
149-
"record_builder" {= "v0.18~preview.130.76+222"}
146+
"record_builder" {= "v0.18~preview.130.83+317"}
150147
"result" {= "1.5"}
151148
"seq" {= "base"}
152-
"sexp_pretty" {= "v0.18~preview.130.76+222"}
153-
"sexp_type" {= "v0.18~preview.130.76+222"}
154-
"sexplib" {= "v0.18~preview.130.76+222"}
155-
"sexplib0" {= "v0.18~preview.130.76+222"}
156-
"shell" {= "v0.18~preview.130.76+222"}
149+
"sexp_pretty" {= "v0.18~preview.130.83+317"}
150+
"sexp_type" {= "v0.18~preview.130.83+317"}
151+
"sexplib" {= "v0.18~preview.130.83+317"}
152+
"sexplib0" {= "v0.18~preview.130.83+317"}
153+
"shell" {= "v0.18~preview.130.83+317"}
157154
"spawn" {= "v0.15.1+ox"}
158-
"splittable_random" {= "v0.18~preview.130.76+222"}
159-
"stdio" {= "v0.18~preview.130.76+222"}
155+
"splittable_random" {= "v0.18~preview.130.83+317"}
156+
"stdio" {= "v0.18~preview.130.83+317"}
160157
"stdlib-shims" {= "0.3.0"}
161-
"string_dict" {= "v0.18~preview.130.76+222"}
158+
"string_dict" {= "v0.18~preview.130.83+317"}
162159
"stringext" {= "1.6.0"}
163-
"textutils" {= "v0.18~preview.130.76+222"}
164-
"time_now" {= "v0.18~preview.130.76+222"}
160+
"textutils" {= "v0.18~preview.130.83+317"}
161+
"time_now" {= "v0.18~preview.130.83+317"}
165162
"topkg" {= "1.0.8+ox"}
166-
"typerep" {= "v0.18~preview.130.76+222"}
167-
"unique" {= "v0.18~preview.130.76+222"}
168-
"univ_map" {= "v0.18~preview.130.76+222"}
169-
"uopt" {= "v0.18~preview.130.76+222"}
163+
"typerep" {= "v0.18~preview.130.83+317"}
164+
"unique" {= "v0.18~preview.130.83+317"}
165+
"univ_map" {= "v0.18~preview.130.83+317"}
166+
"uopt" {= "v0.18~preview.130.83+317"}
170167
"uri" {= "4.4.0"}
171168
"uri-sexp" {= "4.4.0"}
172169
"uutf" {= "1.0.3+ox"}
173-
"variantslib" {= "v0.18~preview.130.76+222"}
174-
"zstandard" {= "v0.18~preview.130.76+222"}
170+
"variantslib" {= "v0.18~preview.130.83+317"}
171+
"zstandard" {= "v0.18~preview.130.83+317"}
175172
]
176173
build: ["dune" "build" "-p" name "-j" jobs]
177174
dev-repo: "git+https://github.com/janestreet/magic-trace.git"

0 commit comments

Comments
 (0)