Merge pull request #6173 from kit-ty-kate/post-2.2.1

Update the install script and changelog after the release of 2.2.1

CHANGES

@@ -3,6 +3,38 @@ repositories (changes that are automatically handled by the format upgrade tools
 are not marked). Those prefixed with "(+)" are new command/option (since
 2.1.0~alpha2).
 
+2.2.1:
+* (*) Fix a regression in `opam install --deps-only` where the direct
+  dependencies were not set as root packages [#6125 @rjbou]
+* (*) Fix a regression when fetching git packages where the resulting git
+  repository could lead to unexpected outputs of git commands, by disabling
+  shallow clone by default except when fetching an opam repositories
+  [#6146 @kit-ty-kate - fix #6145]
+* Mitigate curl/curl#13845 by falling back from `--write-out` to `--fail`
+  if exit code 43 is returned by curl [#6168 @dra27 - fix #6120]
+* Synchronise opam-core.opam with opam-repository changes [#6043 @dra27]
+* Fix and improve the release script and the creation of the
+  `opam-full-<version>.tar.gz` archive [#6067 @kit-ty-kate]
+* Improve and extend the tests [#6125 #6146 @rjbou]
+* Improve the test infrastructure [#6079 #6081 @rjbou]
+* API changes
+  * `?full_fetch` is now `true` by default instead of `false`
+    [#6146 @kit-ty-kate - fix #6145]
+
+2.2.0:
+* Bump `opam-root-version` to 2.2 [#5980 @kit-ty-kate]
+* Cygwin initialisation enhancement
+  * Always pass `--no-version-check` and `--no-write-registry` to Cygwin setup
+    [#6046 @dra27]
+  * Use `--quiet-mode noinput` for the internal Cygwin installation (which is
+    definitely a fully-specified command line) and `--quiet-mode` unattended
+    for external Cygwin installations (in case the user does need to select
+    something, e.g. a mirror) [#6046 @dra27]
+* API changes
+  * `OpamStateConfig.opamroot_with_provenance`: restore previous behaviour to
+    `OpamStateConfig.opamroot` for compatibility with third party code
+    [#6047 @dra27]
+
 2.2.0~rc1:
 * Fix `opam upgrade` wanting to recompile opam files containing the
   `x-env-path-rewrite` field [#6029 @kit-ty-kate - fix #6028]

master_changes.md

@@ -116,6 +116,7 @@ users)
 ## Install script
   * Provide a shell/install.ps1 PowerShell script to install opam on Windows [#5906 @kit-ty-kate @dra27]
   * Add opam 2.2.0 to the install scripts [#6062 @kit-ty-kate]
+  * Add opam 2.2.1 to the install scripts [#6173 @kit-ty-kate]
 
 ## Admin
   * Change hash cache location from `~/.cache` to `<opamroot>/download-cache/hash-cache` [#6103 @rjbou]

release/readme.md

@@ -67,6 +67,7 @@
 ## Publish the release
 
 * add hashes in `install.sh` (and check signatures)
+* bring the changes to the changelog (CHANGES) from the branch of the release to the `master` branch
 * publish opam packages in opam-repository (and add `flags: avoid-version` and `available: opam-version >= "2.1.0"` to each packages if this is not a stable version)
 * update versions (and messages, if necessary) in https://github.com/ocaml/opam-repository/blob/master/repo
 
@@ -82,7 +83,6 @@
 
 * Bump the version with a `~dev` at the end (e.g. `2.2.0~alpha~dev`)
 * Check if reftests needs an update
-* Bring the changes to the changelog (CHANGES) from the branch of the release to the `master` branch
 
 ### On a release candidate
 * create a branch to a `x.y` for rc's and the final release

shell/install.ps1

@@ -15,12 +15,12 @@ param (
   # Install the latest alpha, beta or rc
   [switch]$Dev,
   # Install this specific version of opam instead of the latest
-  [string]$Version = "2.2.0",
+  [string]$Version = "2.2.1",
   # Specify the installation directory for the opam binary
   [string]$OpamBinDir = $null
 )
 
-$DevVersion = "2.2.0"
+$DevVersion = "2.2.1"
 $IsAdmin = (New-Object Security.Principal.WindowsPrincipal([Security.Principal.WindowsIdentity]::GetCurrent())).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
 $DefaultBinDir = If ($IsAdmin) {"$Env:ProgramFiles\opam\bin"} Else {"$Env:LOCALAPPDATA\Programs\opam\bin"}
 
@@ -29,6 +29,7 @@ $SHA512s = @{
   "opam-2.2.0-beta3-x86_64-windows.exe" = "f09337d94e06cedb379c5bf45a50a79cf2b2e529d7c2bb9b35c8a56d40902ff8c7e3f4de9c75fb5c8dd8272b87b2a2645b14e40ef965376ef0d19afd923acf3b";
   "opam-2.2.0-rc1-x86_64-windows.exe"   = "f2ec830a5706c45cb56a96713e296ef756c3f2904ca15f7c2ad0442916a9585fa1de8070208f2a6bb3a84dc74b677f946f5bc386c8ed1489da802b1d66a5e094";
   "opam-2.2.0-x86_64-windows.exe"       = "171b679c192801f7ec783de4c51d614055cff167d521d31c543b6bed14d9eb3d37a808be4d83ff9acfd0fc1d7008e6582dce245836a51109fc0cb8456528c473";
+  "opam-2.2.1-x86_64-windows.exe"       = "7a6dd3012e5553ab85337411d0a145c5d26ceff30687c5e91aaff81d9bd48bbf1852ae37ca8992d57435838a025557512e6ac6958fba7123bacd21d9a8aba31a";
 }
 
 Function DownloadAndCheck {

shell/install.sh

@@ -5,8 +5,8 @@ set -ue
 # (c) Copyright Fabrice Le Fessant INRIA/OCamlPro 2013
 # (c) Copyright Louis Gesbert OCamlPro 2014-2017
 
-VERSION='2.2.0'
-DEV_VERSION='2.2.0'
+VERSION='2.2.1'
+DEV_VERSION='2.2.1'
 DEFAULT_BINDIR=/usr/local/bin
 
 bin_sha512() {
@@ -271,6 +271,17 @@ bin_sha512() {
     opam-2.2.0-x86_64-macos)          echo "d32f7fe7fb9a126cb79f679317914639ddf77765071c8d509eba3acc7585f346d8634cd6e611df78f8c3b546bdca6de82fb4965740b381b76c458b9ba1134e88";;
     opam-2.2.0-x86_64-openbsd)        echo "98d0b20e3d833070e4656ccfde586a47c680cc4e3ee049c36296032be3eecf5fda3b39cf672060febbe2d12b032cb0b22a3934ad474d2c8433831f96d766eff5";;
 
+    opam-2.2.1-arm64-linux)           echo "32360c69e554b7c0376a437b144bcb371a955f1261bebd1854b6720aa89f24ccdd46b2636db4dd4e9f175a67839f9583750bd75b0cb08696b1bf6ea10b61e92c";;
+    opam-2.2.1-arm64-macos)           echo "711c208db843b6719cedb97e8b509161724a6c0e709431ceca2dfa664074371cd47d4e785c67e4600543e8f61e9ea8257b9e70c0dc8398314b2c118c7f1edc2a";;
+    opam-2.2.1-armhf-linux)           echo "9cb64ff3f635fabb9afd0ff811bc6fdd4d883926ecbb270fd5278c01a727668706b35f07097b361b40795ec8b407f1a3c3f1463b40ad5a345e475116631c0918";;
+    opam-2.2.1-i686-linux)            echo "bf16d573137835ce9abbcf6b99cb94a1da69ab58804a4de7c90233f0b354d5e68e9c47ee16670ca9d59866d58c7db345d9723e6eb5fc3a1cb8dca371f0e90225";;
+    opam-2.2.1-ppc64le-linux)         echo "3cd5c12e8c97ae3a8095dc73a37babe3caf281a934cfbd1d80fbaa40f26e27dcb636fe9167f28909cfde46a7a04362f74fe36fe8f5dc125ab331716a7b1a80c5";;
+    opam-2.2.1-s390x-linux)           echo "bfb66917f7890229dcdd47443fcc9b6d7a666f41d82143e1798c141d66598f344e4fc73bfd52f15309fcdc1f65f1c43063c9bdc066600762cd708d12f0839cda";;
+    opam-2.2.1-x86_64-freebsd)        echo "1f9975294065ba898b5a0bcac3330c4c8cf80811cf1a88980af2ef2aaf9136215557a789805c57d19c0d53b21f431fb8d158b5e0a65c914536005f94c0086bfb";;
+    opam-2.2.1-x86_64-linux)          echo "7d3a7585af622e9b70fa4a3fff72f561b96f918b8f2ec55c6bd840a06c03934c461ef228a2ef6633ae295f1e546143b80ea846f2f54027f176ada37d11abbfbc";;
+    opam-2.2.1-x86_64-macos)          echo "599801e9bdbe32c1bf81a708ef4ced25eb1eb78aa3a6af42e6968d0dd21cef46a3ee21b7b2bc7c620cc24e92cd317589b5f69bc99ed823a14ae271a7bc06c57b";;
+    opam-2.2.1-x86_64-openbsd)        echo "647a4a06088c953d72c15aba9af32859b8e0322fa3ca68c86a1aa15c8789631178348ef6d3b045ee4cd4d46100a3be2fcb8bc4bc8099508d506694b50890535c";;
+
     *) echo "no sha";;
   esac
 }