Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Global sandboxing setting #2213

Merged
merged 53 commits into from
Jul 29, 2019
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
55f2aaa
add sandbox_config types
aalekseyev May 28, 2019
c8c15d5
add sandboxing_preference to config file
aalekseyev May 28, 2019
541e81d
propagate config to the actual logic
aalekseyev May 28, 2019
e65d010
Annotate all the call sites that clearly rely on no-sandboxing.
aalekseyev May 28, 2019
535aea5
cli
aalekseyev May 29, 2019
3b02538
discovered another breakage with ocaml platform
aalekseyev May 29, 2019
66625d7
this bit seems unnecessary
aalekseyev Jul 23, 2019
081e4b2
changelog entry
aalekseyev May 29, 2019
61882e3
explore an idea: why not treat sandbox requirement as one of the depe…
aalekseyev Jul 19, 2019
0543de2
the parsing layer
aalekseyev Jul 22, 2019
d242a16
require dune 1.11 and update the changelog
aalekseyev Jul 22, 2019
f83d45c
test
aalekseyev Jul 22, 2019
52de199
fix bug
aalekseyev Jul 22, 2019
dd0f137
fix test
aalekseyev Jul 22, 2019
3b5f834
add to the test
aalekseyev Jul 22, 2019
bcff36f
test preserve_file_kind
aalekseyev Jul 22, 2019
67d0494
it's not clear what the solution is
aalekseyev Jul 22, 2019
6b0cd6e
fix alias stamp file dir sandboxing
aalekseyev Jul 23, 2019
5e6ba9c
sandbox aliases, fix some sandboxed actions
aalekseyev Jul 23, 2019
cbf17ea
introduce Sandbox_mode.Dict.t
aalekseyev Jul 23, 2019
76a8858
improve error message, and make code easier to follow
aalekseyev Jul 23, 2019
206b6df
remove no_sandboxing that will become unnecessary soon
aalekseyev Jul 23, 2019
77bf41e
too late for 1.11
aalekseyev Jul 23, 2019
85b4035
do not sandbox actions that have nothing to sandbox
aalekseyev Jul 23, 2019
5a67d1f
Merge remote-tracking branch 'origin/master' into global-sandboxing-s…
aalekseyev Jul 23, 2019
db7959a
swap changelog entries
aalekseyev Jul 23, 2019
b0c0251
Merge remote-tracking branch 'origin/master' into global-sandboxing-s…
aalekseyev Jul 24, 2019
b020446
fix tests
aalekseyev Jul 24, 2019
2f3a821
remove stale comment, remove seemingly unnecessary no_sandboxing anno…
aalekseyev Jul 24, 2019
daab63a
make promotion work with sandboxing
aalekseyev Jul 24, 2019
7ff667c
odoc seems fine now
aalekseyev Jul 24, 2019
1568d00
make copy_and_add_line_directive work well with sandboxing
aalekseyev Jul 24, 2019
3675518
add doc
aalekseyev Jul 24, 2019
7e43558
merge
aalekseyev Jul 24, 2019
16ea040
doc
jeremiedimino Jul 25, 2019
1d1da0c
Add missing .ml dependencies for expect tests
jeremiedimino Jul 25, 2019
2007786
Fix dependencies of inline tests
jeremiedimino Jul 25, 2019
8375ed2
better error if targets are missing when you move them from sandbox
aalekseyev Jul 25, 2019
af07f49
Merge branch 'global-sandboxing-setting' of github.com:aalekseyev/dun…
aalekseyev Jul 25, 2019
0c4a65e
Fix deps of ppx.exe
jeremiedimino Jul 25, 2019
e022e8a
Merge branch 'global-sandboxing-setting' of github.com:aalekseyev/dun…
aalekseyev Jul 25, 2019
b280639
doc
jeremiedimino Jul 25, 2019
32d280b
move archive_files handling to [Lib.Lib_and_module.link_flags]
aalekseyev Jul 25, 2019
56df7fa
fix another missing dependency
aalekseyev Jul 25, 2019
6b11a16
Merge branch 'global-sandboxing-setting' of github.com:aalekseyev/dun…
aalekseyev Jul 25, 2019
ca1d6cf
add DUNE_SANDBOX env var
aalekseyev Jul 25, 2019
0a9fd35
Remove unused ignore
jeremiedimino Jul 25, 2019
d8b2571
improve exception
aalekseyev Jul 25, 2019
149c59a
Merge branch 'global-sandboxing-setting' of github.com:aalekseyev/dun…
aalekseyev Jul 25, 2019
552f5b9
Merge remote-tracking branch 'origin/master' into global-sandboxing-s…
aalekseyev Jul 25, 2019
194ef81
merge
aalekseyev Jul 29, 2019
12ea213
credit jdimino
aalekseyev Jul 29, 2019
2740d9d
Merge remote-tracking branch 'origin/master' into global-sandboxing-s…
aalekseyev Jul 29, 2019
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
Prev Previous commit
Next Next commit
fix alias stamp file dir sandboxing
Signed-off-by: Arseniy Alekseyev <aalekseyev@janestreet.com>
  • Loading branch information
aalekseyev committed Jul 23, 2019
commit 6b0cd6e5cbbebf6c783ee9e4e403b281c77b9cd9
11 changes: 7 additions & 4 deletions src/alias.ml
Original file line number Diff line number Diff line change
@@ -61,15 +61,18 @@ let suffix = "-" ^ String.make 32 '0'
let name t = t.name
let dir t = t.dir

let fully_qualified_name t = Path.Build.relative t.dir t.name

(* Where we store stamp files for aliases *)
let alias_dir = Path.Build.(relative root ".aliases")

let stamp_file t =
let stamp_file_dir t =
let local = Path.Build.local t.dir in
Path.Build.append_local alias_dir local

let fully_qualified_name t = Path.Build.relative t.dir t.name

let stamp_file t =
Path.Build.relative
(Path.Build.append_local alias_dir local)
(stamp_file_dir t)
(t.name ^ suffix)

let find_dir_specified_on_command_line ~dir ~file_tree =
1 change: 1 addition & 0 deletions src/alias.mli
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ val make : string -> dir:Path.Build.t -> t
*)
val name : t -> string
val dir : t -> Path.Build.t
val stamp_file_dir : t -> Path.Build.t

val to_dyn : t -> Dyn.t

2 changes: 1 addition & 1 deletion src/dep.ml
Original file line number Diff line number Diff line change
@@ -154,7 +154,7 @@ module Set = struct
let dirs t =
fold t ~init:Path.Set.empty ~f:(fun f acc ->
match f with
| Alias a -> Path.Set.add acc (Path.build (Alias.dir a))
| Alias a -> Path.Set.add acc (Path.build (Alias.stamp_file_dir a))
| Glob g -> Path.Set.add acc (File_selector.dir g)
| File f -> Path.Set.add acc (Path.parent_exn f)
| Universe