2.0.9 backported commits #4547
Merged
2.0.9 backported commits #4547
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
|
Need to replace some - - Fix sandbox script shell mistake that made PWD read-write on remove actions [@4589 @AltGr]
- - Port bwrap improvements to sandbox_exec [@4589 @AltGr]
+ - Fix sandbox script shell mistake that made PWD read-write on remove actions [#4589 @AltGr]
+ - Port bwrap improvements to sandbox_exec [#4589 @AltGr] |
rjbou
commented
Mar 10, 2021
|
indeed, thanks! |
kit-ty-kate
approved these changes
Mar 11, 2021
|
Linking in #4573 |
4 tasks
|
Can't we release 2.0.9 without #4573? There are some important changes for macOS and I hope to release 2.0.9 in May. |
|
We're trying to get the 2.1 release candidate out of the door, first - once that's done (which really should be any day now!), releasing 2.0.9 would be fine. It's not blocked on 4573, it was just linked to consider it. The solutions to #4394 and #4636 both need to be back-ported to 2.0.x, although not necessarily to 2.0.9. See the milestone for more info. |
|
That sounds good. Thank you for the perfect explanation! |
Signed-off-by: Sora Morimoto <sora@morimoto.io>
Signed-off-by: Sora Morimoto <sora@morimoto.io> Co-Authored-By: Kate <kit.ty.kate@disroot.org>
Windows *really* doesn't like that.
The previous behaviour was to bind-mount $TMPDIR to /tmp within the sandbox, and re-set TMPDIR accordingly ; however, this meant that absolute paths within TMPDIR could be incompatible between the outside and the inside of the sandbox. This became a visible problem with dune 2.8, which redefines TMPDIR to a subdirectory (e.g. `/tmp/buildXXXX.dune`). If you happen to be running tests with an OPAMROOT within $TMPDIR, your opam root will no longer be accessible, and packages that run opam commands from within the sandbox (which is discouraged, but well...) will break. In our tests, run through dune, OPAMROOT gets created in `/tmp/buildXXXX.dune/OPAM`, then packages get installed within a sandbox, this is relocated to `/tmp/OPAM` but `OPAMROOT` and `OPAM_SWITCH_PREFIX` remained set to below `/tmp/buildXXXX.dune`, and things broke.
this made PWD always rw accessible on remove actions, and was possibly dangerous
Part of Fix the sandbox check with the new layout
the latter is required by the former, and better stay consistent with the compiler version used across arches.
…rs in switch directory path
rjbou
force-pushed
the
209
branch
2 times, most recently
from
3cfe557
to
68f87e7
Compare
|
Last update, rebased and commits squashed! |
|
Yay! |
|
|
dra27
reviewed
Jul 2, 2021
…mat version field `opam-version' from the opam root version.
They provide reading function that don't error are reading, do no show/stop at erros (unless strict mode is enabled)
permit read only loading, with best effort on file reading. This is handled by function in `OpamStateConfig' that permit to load state files: config, switch-config, switch-state, and repos-config.
The sentinel group of kind `#` is now processed correctly in OpamFile.SyntaxFile. This allows, for example, opam 2.2 to use opam-file-format 2.1 and still have `opam-version: "2.2"`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backported commits for the 2.0.9 release
Note: blocking setup-ocaml w/dune
Still to cherry-pick
Error free opam root loading
Sandbox
$TMPDIRto a separate tmpfs [Sandbox script: change handling of TMPDIR #4589 @AltGr]PWDread-write on remove actions [Sandbox script: change handling of TMPDIR #4589 @AltGr]Lint
conf#4549]Internal
Package building
--rootand--switchare now reflected in environment variables when building packages so that calls toopamduring build access the correct root and switch [Make sure that OPAMROOT and OPAMSWITCH are properly set when executing build commands #4668 @LasseBlaauwbroek]Build
Pin
Infrastructure
Test