Skip to content

Commit

Permalink
Release script fixes and improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
kit-ty-kate committed May 16, 2024
1 parent 1508180 commit 1cb2f33
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion release/Dockerfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ USER opam
WORKDIR /home/opam/
CMD tar xz >&2 && \
cd opam-full-${VERSION} >&2 && \
echo "(${LINKING})" > src/client/linking.sexp && \
{ { ./configure --with-mccs >&2 && make lib-ext >&2 ; } || \
./configure --with-vendored-deps >&2 ; } && \
echo "(${LINKING})" > src/client/linking.sexp && \
make opam >&2 && \
strip opam >&2 && \
cat opam
3 changes: 2 additions & 1 deletion release/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ host: $(OUTDIR)/opam-full-$(VERSION).tar.gz build/$(HOST).env
MAKE=$(MAKE) \
$(EXPORTS_$(HOST_OS)); \
cd build/opam-full-$(VERSION) && \
{ ./configure --with-vendored-deps || { ./configure && $(MAKE) lib-ext; }; } && \
{ { ./configure --with-mccs >&2 && $(MAKE) lib-ext >&2 ; } || \
./configure --with-vendored-deps >&2 ; } && \
echo "$(call LINKING,$(HOST_OS))" >src/client/linking.sexp && \
$(MAKE) opam; \
)
Expand Down
6 changes: 3 additions & 3 deletions release/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* /!\ Once the tag pushed, it can be updated [different commit] only in case of severe issue
* create a release (or prerelease if intermediate release) draft on github based on your tag (https://github.com/ocaml/opam/releases/new)
* fetch locally the tag
* launch docker using the Docker GUI macOS app
* generate opam artifacts, using `release/release.sh <tag>` from a macOS/arm64 machine, it requires to have Docker and QEMU installed (see below device requirements)
* generate the signatures using `release/sign.sh <tag>`
* add releases notes (content of `master_changes.md`) in the release draft
Expand Down Expand Up @@ -46,8 +47,7 @@
---

## Device requirements
* Mac M1
* installed: git, gpg, qemu>=8.1.0, docker>=24.0.0
* Mac M1 or above with Rosetta2
* brew dependencies: git, gpg, qemu>=8.1.0, docker>=24.0.0, md5sha1sum (only when releasing on the 2.1 branch)
* opam repo with the tag fetched
* Have the secret key available
* Launch docker using the Docker GUI macOS app

0 comments on commit 1cb2f33

Please sign in to comment.