Skip to content

Commit

Permalink
Merge pull request #6282 from kit-ty-kate/install-2.3.0-rc1
Browse files Browse the repository at this point in the history
Add 2.3.0~rc1 to the install scripts
  • Loading branch information
rjbou authored Oct 31, 2024
2 parents 10f0680 + 80c4cda commit 8ac9c1b
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
1 change: 1 addition & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ users)
* Add 2.3.0\~alpha1 to the install scripts [#6203 @kit-ty-kate]
* 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]

## Admin
* ◈ Add `opam admin compare-versions` to compare package versions for sanity checks [#6197 @mbarbin]
Expand Down
3 changes: 2 additions & 1 deletion shell/install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ param (
[string]$OpamBinDir = $null
)

$DevVersion = "2.3.0~beta2"
$DevVersion = "2.3.0~rc1"
$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"}

Expand All @@ -33,6 +33,7 @@ $SHA512s = @{
"opam-2.3.0-alpha1-x86_64-windows.exe" = "2058acf0810c8bbc9d924827484c800b47f74d9c90d70319343a7e8e3ab6592b9f0dea1c76547ea1294b72106c3bcdb91e41718471ec85211ed43d7a8d7372c7";
"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";
}

Function DownloadAndCheck {
Expand Down
17 changes: 16 additions & 1 deletion shell/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -ue
# (c) Copyright Louis Gesbert OCamlPro 2014-2017

VERSION='2.2.1'
DEV_VERSION='2.3.0~beta2'
DEV_VERSION='2.3.0~rc1'
DEFAULT_BINDIR=/usr/local/bin

bin_sha512() {
Expand Down Expand Up @@ -282,6 +282,8 @@ bin_sha512() {
opam-2.2.1-x86_64-macos) echo "599801e9bdbe32c1bf81a708ef4ced25eb1eb78aa3a6af42e6968d0dd21cef46a3ee21b7b2bc7c620cc24e92cd317589b5f69bc99ed823a14ae271a7bc06c57b";;
opam-2.2.1-x86_64-openbsd) echo "647a4a06088c953d72c15aba9af32859b8e0322fa3ca68c86a1aa15c8789631178348ef6d3b045ee4cd4d46100a3be2fcb8bc4bc8099508d506694b50890535c";;

### opam 2.3 series ###

opam-2.3.0-alpha1-arm64-linux) echo "2e243af1560ff92bb14c11cf030ed4a207847606f43c7fed09d2a2790fabcd6568a92b1c677483062c846cad30fb0fc26c0be5cb201e8be58e370f17519102cd";;
opam-2.3.0-alpha1-arm64-macos) echo "07e5834d0163d563979121a2f5306bb3b62b14e8f56ac43372d55a865bb6291c3f70d3be4603f0ca5078061e2811ec1a6f8dfa6d0a9b5135dedec1fbd6f6fe1b";;
opam-2.3.0-alpha1-armhf-linux) echo "a01e8926c2e6da7bba975c105a37e8fc7a7bd6b6b1e9b70ddc23cd02a744e3f8f83522bf366ad67d5e7314159a243fa2ea3df2198e042b5063dfb6e9f0219f28";;
Expand Down Expand Up @@ -318,6 +320,19 @@ bin_sha512() {
opam-2.3.0-beta2-x86_64-netbsd) echo "db8b33e007feee96e7e750347baecb95ccfddffc1134e911ba16c4c1621c129516b7608893ee76424473e46d7bf81928b10865ea9180cca290f583a20e4d377c";;
opam-2.3.0-beta2-x86_64-openbsd) echo "7c125d000654b6b84c2baad1f79d931c1bc0bde800c32c34878b97ca4a4d9ed718e196087bfa00574a6b0c66b8433aaab7dd64d84b0b12aad6139ff8ee769f92";;

opam-2.3.0-rc1-arm64-linux) echo "a5683faeacd9f2239b73f4bfa4a983cb426bb2df3276776501afeb970726575420e3926d401ee9ba4aa158339e10562df04f02ac65f96e0453695387ebd9f1bd";;
opam-2.3.0-rc1-arm64-macos) echo "b40d16a5c850787c99c9bf91b950d321826bf5c02f26e2bd4428713b6732d678f5826ea34606e5852b8a6f2f1cdd16f52d881e4dbbb4f7cd9bd61910874b9156";;
opam-2.3.0-rc1-armhf-linux) echo "b320d176cdb46257af5623b8815bcd302c73304d41658ed8ff055debce93abfd343e43e68be54bad756ed76dd92f3aec87e59fad9f9a120ed22b0a73666f6fb4";;
opam-2.3.0-rc1-i686-linux) echo "b67d523f56bac6d06c4167cae3c8d14a506d759e7d937e1a3bc34ffedf534288a9e61917df1cb936aeb51b0869caa49e8dbf239510a5d4a19f5fb5136fed1ad6";;
opam-2.3.0-rc1-ppc64le-linux) echo "80525709e7756af9150da23ec5014b9833cf01da205786d255748b45cf2ae3b12a28b56392d6a2a5ef97eafa74e72a1431b91b040a4b5af1f3d7b2c900cfcf78";;
opam-2.3.0-rc1-riscv64-linux) echo "ed45f72d958c4791656aa79eb7df2714f0f2e113e203442f949b223916441d88abef85d9e10b4b50edc163f47e091f14ea2b27c93e5231e0b0eb3ff5f2de40c4";;
opam-2.3.0-rc1-s390x-linux) echo "f94c4675f9952535545822cb8cbbc3c10762a09ab3559be3a662caeddbc50ecdb1fb0d91a56a1fe663915a3638639d94571c37fd93370d388b69fcb8bfb6d222";;
opam-2.3.0-rc1-x86_64-freebsd) echo "eb65e38a54e39d5f857f70ca6d357d6efc3c9b2523f75523a0bc7759773e8af53bc116eb76a3724147253b3b5316e99dce3792bbd3f9f195c6b8c204e9a1ca8d";;
opam-2.3.0-rc1-x86_64-linux) echo "7419ad0baa7758254b2468998522b9a0ab9d3e6336509cfe509232e9c4870040f95bdac8e6b47f35fca8967da718f161029f6223355e038039b05464b721df70";;
opam-2.3.0-rc1-x86_64-macos) echo "a94b57be3339a2f1556ef5b1bc7b812c3ab0188458433be7f1aed3a2c2387e7af7811b112aad7ffd4b80aaa9c37eec02a3444771ed05dc84896242048b17856c";;
opam-2.3.0-rc1-x86_64-netbsd) echo "639b342149926fdcef629dc069034ab4d49e3582dbbd11ad2617c0af3c941bfc2d3ec4191d4549b1b031b1fbddc9f13b02ccbea923a9aa4d0d2d289c2ce620ea";;
opam-2.3.0-rc1-x86_64-openbsd) echo "08b4be43a921f8274f862a9ed1943cd980f192ba7df4485cf80c8555b268b05b0dec70c9d0cf29751099435e282c076e0b523d3110d8d105e0c1e0aa7626af88";;

*) echo "no sha";;
esac
}
Expand Down

0 comments on commit 8ac9c1b

Please sign in to comment.