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.

Sign up for GitHub

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

Remove opam 2.1 support from the release script #6084

Merged
merged 1 commit into from
Jul 10, 2024
Merged

Remove opam 2.1 support from the release script #6084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ users)
* Ensure the configure file stays as it is in the tag, in the opam-full-<version>.tar.gz archive [#6066 @kit-ty-kate]
* Exclude the .git directory from the release archive when using GNU tar [#6066 @kit-ty-kate]
* Ensure non-existing %.cache target fail with a fatal error [#6066 @kit-ty-kate]
* Remove opam 2.1 support from the release script [#6084 @kit-ty-kate]

## Install script
* Provide a shell/install.ps1 PowerShell script to install opam on Windows [#5906 @kit-ty-kate @dra27]
Expand Down
3 changes: 1 addition & 2 deletions release/Dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ USER opam
WORKDIR /home/opam/
CMD tar xz >&2 && \
cd opam-full-${VERSION} >&2 && \
{ { ./configure --with-mccs >&2 && make lib-ext >&2 ; } || \
./configure --with-vendored-deps >&2 ; } && \
./configure --with-vendored-deps --with-mccs && \
echo "(${LINKING})" > src/client/linking.sexp && \
make opam >&2 && \
strip opam >&2 && \
Expand Down
11 changes: 4 additions & 7 deletions release/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,24 @@ build/%.image: build/Dockerfile.%
docker build -t opam-build-$* -f $^ build
touch $@

SHA_LINK = $(if $(shell mkdir -p build/tmp_extract && tar xzf "$(OUTDIR)/opam-full-$(VERSION).tar.gz" -C build/tmp_extract && grep -F URL_sha build/tmp_extract/opam-full-$(VERSION)/src_ext/Makefile.sources),-lsha_stubs)

# Actually, this is for alpine 3.13, and varies
CLINKING_linux = \
-Wl,-Bstatic \
-lunix -lmccs_stubs -lmccs_glpk_stubs $(SHA_LINK) \
-lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs \
-lstdc++ \
-static-libgcc \
-static
# -Wl,-Bdynamic

CLINKING_macos = \
-lunix -lmccs_stubs -lmccs_glpk_stubs $(SHA_LINK) \
-lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs \
-lstdc++

CLINKING_openbsd = $(CLINKING_macos)
CLINKING_freebsd = $(CLINKING_macos)

CLINKING_windows = \
-lunix -lmccs_stubs -lmccs_glpk_stubs $(SHA_LINK) \
-lunix -lmccs_stubs -lmccs_glpk_stubs -lsha_stubs \
-lopam_stubs_win32_stubs \
-l:libstdc++.a -l:libpthread.a \
-Wl,-static \
Expand Down Expand Up @@ -122,8 +120,7 @@ host: $(OUTDIR)/opam-full-$(VERSION).tar.gz build/$(HOST).env
MAKE=$(MAKE) \
$(EXPORTS_$(HOST_OS)); \
cd build/opam-full-$(VERSION) && \
{ { ./configure --with-mccs >&2 && $(MAKE) lib-ext >&2 ; } || \
./configure --with-vendored-deps >&2 ; } && \
./configure --with-vendored-deps --with-mccs && \
echo "$(call LINKING,$(HOST_OS))" >src/client/linking.sexp && \
$(MAKE) opam; \
)
Expand Down
4 changes: 2 additions & 2 deletions release/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
* tag the release (git tag -am 2.2.0 2.2.0; git push origin 2.2.0)
* /!\ 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
* Make sure the repository is in the correct state: `git switch --detach <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>`
Expand Down Expand Up @@ -92,6 +92,6 @@
## Device requirements
* Mac M1 or above with Rosetta2
* >=70GB of disk space free
* brew dependencies: git, gpg, qemu>=8.1.0, docker>=24.0.0, md5sha1sum (only when releasing on the 2.1 branch)
* brew dependencies: git, gpg, qemu>=8.1.0, docker>=24.0.0
* opam repo with the tag fetched
* Have the secret key available
Loading