update curl on Windows (digital-asset#17416)

Old version is not available anymore. Also revert the latest canton bump as the canton artifacts have changed. Co-authored-by: Remy Haemmerle <Remy.Haemmerle@daml.com>
kgeonw · Sep 18, 2023 · ce3fcf1 · ce3fcf1
1 parent 49b2a47
commit ce3fcf1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 34 deletions.
diff --git a/canton/BUILD.bazel b/canton/BUILD.bazel
@@ -66,8 +66,8 @@ if [ "{local}" = "true" ]; then
     exit 0
 fi
 
-CANTON_ENTERPRISE_VERSION=2.8.0-snapshot.20230914.11170.0.v3bc03a0c
-CANTON_ENTERPRISE_SHA=6f041102eb604d9a8fe7f043513bb113974c38d8b4c223ab701602967f19a7d3
+CANTON_ENTERPRISE_VERSION=2.8.0-snapshot.20230913.11166.0.v590556d1
+CANTON_ENTERPRISE_SHA=3cd7bd2c6864dfdd697be04af90717ba14fc13f50ba7bd28a12e41618c96f68e
 
 url=https://digitalasset.jfrog.io/artifactory/canton-enterprise/canton-enterprise-$$CANTON_ENTERPRISE_VERSION.tar.gz
 

diff --git a/canton_dep.bzl b/canton_dep.bzl
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 canton = {
-    "sha": "cd72960040e3a231f4b922ae8a88bff9a2775ea1df218d1d4b01361acd6e4f54",
-    "url": "https://www.canton.io/releases/canton-open-source-2.8.0-snapshot.20230914.11170.0.v3bc03a0c.tar.gz",
+    "sha": "3572c35c67ec944d545517747de50496093f3c8e22482b934897045aa3be1f21",
+    "url": "https://www.canton.io/releases/canton-open-source-2.8.0-snapshot.20230913.11166.0.v590556d1.tar.gz",
     "local": False,
 }
diff --git a/dev-env/windows/manifests/curl.json b/dev-env/windows/manifests/curl.json
@@ -1,39 +1,14 @@
 {
-    "version": "7.81.0",
+    "version": "8.3.0_1",
     "description": "Command line tool and library for transferring data with URLs",
     "homepage": "https://curl.haxx.se/",
     "license": "MIT",
     "architecture": {
         "64bit": {
-            "url": "https://curl.se/windows/dl-7.81.0/curl-7.81.0-win64-mingw.zip",
-            "hash": "066b575e457e0c14182a0f96d95647bf3a9c4b0fb6caf456bab99f27f97881e8",
-            "extract_dir": "curl-7.81.0-win64-mingw"
-        },
-        "32bit": {
-            "url": "https://curl.se/windows/dl-7.81.0/curl-7.81.0-win32-mingw.zip",
-            "hash": "d6f895e7a8bb83ed81812becb78229e1aadfacdf7dceee6904aabc12dba20a43",
-            "extract_dir": "curl-7.81.0-win32-mingw"
+            "url": "https://curl.se/windows/dl-8.3.0_1/curl-8.3.0_1-win64-mingw.zip",
+            "hash": "50837a214b5307e9334f8b79acb8978324222126e7cc90a06465f82945d205c2",
+            "extract_dir": "curl-8.3.0_1-win64-mingw"
         }
     },
-    "bin": "bin\\curl.exe",
-    "checkver": {
-        "url": "https://curl.haxx.se/windows/",
-        "regex": "Build<\\/b>:\\s+([\\d._]+)"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://curl.se/windows/dl-$version/curl-$version-win64-mingw.zip",
-                "extract_dir": "curl-$matchHead-win64-mingw"
-            },
-            "32bit": {
-                "url": "https://curl.se/windows/dl-$version/curl-$version-win32-mingw.zip",
-                "extract_dir": "curl-$matchHead-win32-mingw"
-            }
-        },
-        "hash": {
-            "url": "$baseurl/hashes.txt",
-            "find": "SHA256\\($basename\\)=\\s+([a-fA-F\\d]{64})"
-        }
-    }
+    "bin": "bin\\curl.exe"
 }