Merge pull request #6293 from kit-ty-kate/install-2.3.0

Add opam 2.3.0 to the install scripts
ocaml · Nov 13, 2024 · 06580ae · 06580ae
2 parents 6542fc6 + 0a59a3a
commit 06580ae
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -93,6 +93,7 @@ users)
   * Add 2.3.0\~beta1 to the install scripts [#6238 @rjbou]
   * Add opam 2.3.0\~beta2 to the install scripts [#6262 @kit-ty-kate]
   * Add opam 2.3.0\~rc1 to the install scripts [#6282 @kit-ty-kate]
+  * Add opam 2.3.0 to the install scripts [#6293 @kit-ty-kate]
 
 ## Admin
   * ◈ Add `opam admin compare-versions` to compare package versions for sanity checks [#6197 @mbarbin]

diff --git a/shell/install.ps1 b/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.1",
+  [string]$Version = "2.3.0",
   # Specify the installation directory for the opam binary
   [string]$OpamBinDir = $null
 )
 
-$DevVersion = "2.3.0~rc1"
+$DevVersion = "2.3.0"
 $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"}
 
@@ -34,6 +34,7 @@ $SHA512s = @{
   "opam-2.3.0-beta1-x86_64-windows.exe"  = "bbac0c1e217525a62a557b038aa738609d16799588d0cec99e89c10bd20fb5f2b61482f4418bd06cf7f7f5c7da7f1585514bd7fdc2ced2bde9673ede58f23905";
   "opam-2.3.0-beta2-x86_64-windows.exe"  = "9d24d5af900c263c4ba0803661f68b21ac85b4ba3281b71edd508c412420f20329cc03958fc1123b1a6adaf15505a9519f70ed4673c2f548dee0319c8a7b2d0b";
   "opam-2.3.0-rc1-x86_64-windows.exe"    = "c40bc8604fa1143b13511bed37296c129b78e275738dfcc945418275d5f0bbd3984d997c5d86b2aea00a5b8026a15751e00111225ccf60979ee23113b98eac8e";
+  "opam-2.3.0-x86_64-windows.exe"        = "5b1f46c11a9c46ae6dff02b4076ecdfd6517bc582ae78224e6eb15b921c33f45d2f67d8793b4502c1573bbfd887e3519a4ce5dab13e54ad107dcde1a1204a8d6";
 }
 
 Function DownloadAndCheck {

diff --git a/shell/install.sh b/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.1'
-DEV_VERSION='2.3.0~rc1'
+VERSION='2.3.0'
+DEV_VERSION='2.3.0'
 DEFAULT_BINDIR=/usr/local/bin
 
 bin_sha512() {
@@ -333,6 +333,19 @@ bin_sha512() {
     opam-2.3.0-rc1-x86_64-netbsd)     echo "639b342149926fdcef629dc069034ab4d49e3582dbbd11ad2617c0af3c941bfc2d3ec4191d4549b1b031b1fbddc9f13b02ccbea923a9aa4d0d2d289c2ce620ea";;
     opam-2.3.0-rc1-x86_64-openbsd)    echo "08b4be43a921f8274f862a9ed1943cd980f192ba7df4485cf80c8555b268b05b0dec70c9d0cf29751099435e282c076e0b523d3110d8d105e0c1e0aa7626af88";;
 
+    opam-2.3.0-arm64-linux)           echo "a551cbaa44a6945e09b3daa3a3a7477821062d385037543cb71a188e4625c4ced76422689437aee602707076c1d16b68bed99ad5a31df98e69a8810dccb037b3";;
+    opam-2.3.0-arm64-macos)           echo "45a6ca26eed3fe5937b1940f2c41c24517c0920d9632fd9eea3e0613411e85cb4126effd645d2915e37c65022aa0c483d2c98f8ce25dd8b70bb98e2c4ecd7804";;
+    opam-2.3.0-armhf-linux)           echo "06db12228e1316aa3c57b27812ad09993e32ae4f1ae68f775df064f39ecb7536cbd8aff6cf0a9cf85b45a940193531ce5056225338b1729ba0ff2d04ebf4e046";;
+    opam-2.3.0-i686-linux)            echo "4c0e8771889a36bad4d5f964e2e662d5b611e6f112777d3d4eea3eea919d109cd17826beba38e6cfa1ad9553a0a989d9268f911ea5485968da04b1e08efc7de2";;
+    opam-2.3.0-ppc64le-linux)         echo "69277baab094007b3e409305dd58b8cd321ecbae436e31fe12e3c431e8a00373e450f1865f51e0effbe3724e55b20be3611663e7c4826d486f9a0f73848ae907";;
+    opam-2.3.0-riscv64-linux)         echo "aff97b81d7952170fe926a36f8c2fa4ab01ebbcca3c172c252e5dff6cb9eb9732e7cf5d0c31100264129c1d98c0e47ca94add7e3976e63f28e0d900f4be5da97";;
+    opam-2.3.0-s390x-linux)           echo "d7ccea44f66862c6151f29183c6a66a053c641a4d18d8c8689b0940ec4ed12b149e56e52524f798fc4af8c7c9e879859d1fc54dd94054bb8e45ef91a3bf7e763";;
+    opam-2.3.0-x86_64-freebsd)        echo "b8b29b84bd76ee90df531a2045950d7f098ac4d7040f651807ac63829fa1bf7dc81b998adb7628c57fff0ce5c112a4749a04f46e84688232d0fb2f8debd24d90";;
+    opam-2.3.0-x86_64-linux)          echo "d4271d2387751313d5f904e8fdb3133ea893c72d09737139266d2bbe7624f81665a4276d2e55aa71856630ece8ce226b989560076599baae9afc053c5815f8c8";;
+    opam-2.3.0-x86_64-macos)          echo "18c98cbbd986e33e06943522d0cce6725615406c4f072e7487a56242e2f03de0f436a674b590a5ebfbbe47b7819358926bd3ce71c5b847227b5d0d3de120d6ee";;
+    opam-2.3.0-x86_64-netbsd)         echo "3ff9920f90dbf848b81448ad6fa2c74a96514a2f3cd92aa655f1bb585aae3233fa7bbddd855713356dfe879b326c3f3ea5449a549322956e802f61c383880b20";;
+    opam-2.3.0-x86_64-openbsd)        echo "684cbb23035de99b75b5a99b7844b8a904f12b6817df9996bccef7164fe9574bed525ddec3e6f0c7c45188c0fbca7166b9644202ee0a6a5a85fbeae5dd31944f";;
+
     *) echo "no sha";;
   esac
 }