-
Notifications
You must be signed in to change notification settings - Fork 359
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
Post 2.3.0~alpha1 release bumps and fixes #6204
Conversation
Bump done in 1e79693 Dune 2.6 makes the opam executables non-writeable so we have to chmod to strip the symbols
… the FreeBSD package manager This can happen when the current release is out-of-date (e.g. FreeBSD 13.2 vs 13.3)
This leaves more time for the release manager to execute 'net stop sshd && net start sshd' when needed, as sometimes Windows will refuse to have users ssh into the machine without a password
94749c5
to
efdba21
Compare
dune 2.6 has a bug that prevents opam-core from being built
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All good - on a combined altar of removing some Dune magic from the scripts and reducing code duplication, it looks like it would be worth adding a target to Makefile
which produces a stripped opam executable.
chmod u+w _build/default/src/client/opamMain.exe && \ | ||
strip opam ; \ | ||
} >&2 && \ | ||
cat opam |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't it be slightly better to copy it here? (or even potentially move this into Makefile
- make opam-stripped
or some such)? Along the lines of:
chmod u+w _build/default/src/client/opamMain.exe && \ | |
strip opam ; \ | |
} >&2 && \ | |
cat opam |
chmod u+w _build/default/src/client/opamMain.exe && \ | |
strip opam ; \ | |
} >&2 && \ | |
cat opam | |
cp opam opam-stripped && \ | |
chmod 775 opam-stripped && \ | |
strip opam-stripped ; \ | |
} >&2 && \ | |
cat opam-stripped |
@@ -124,6 +123,7 @@ host: $(OUTDIR)/opam-full-$(VERSION).tar.gz build/$(HOST).env | |||
echo "$(call LINKING,$(HOST_OS))" >src/client/linking.sexp && \ | |||
$(MAKE) opam; \ | |||
) | |||
chmod u+w build/opam-full-$(VERSION)/_build/default/src/client/opamMain.exe |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Similarly here: in fact, the duplication kinda increases the case for having $(MAKE) opam-stripped
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done in #6208
Just a minor data point that makes it a bit easier to package in operating systems is to use similar targets to GNU projects: in this case, it would be |
in our case the stripped binary is not installed but only copied to the root directory of the project |
The release process for 2.3.0~alpha1 was pretty eventful and a couple of fixes were required after the merge of #5381 which we missed.
This PR is also bumping master to 2.4.0~alpha1 as a new 2.3 branch was already created.
I'll create a similar PR for the 2.3 branch as wellBackported in #6205