[GR-54741] Enforce strong hashes for mx downloads.

rschatz · rschatz · commit 909e24c9fbb5 · 2024-06-21T23:11:24.000Z
PullRequest: graal/18059
diff --git a/common.json b/common.json
@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.26.0",
+  "mx_version": "7.27.0",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -1,5 +1,5 @@
 suite = {
-  "mxversion": "7.5.2",
+  "mxversion": "7.27.0",
   "name" : "compiler",
   "sourceinprojectwhitelist" : [],
 
diff --git a/espresso/ci/ci_common/common.jsonnet b/espresso/ci/ci_common/common.jsonnet
@@ -66,6 +66,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
         "<graal>/tools/**",
         "<graal>/regex/**",
         "<graal>/sulong/**",
+        "<graal>/pyproject.toml",
       ] + base.basic_guard_includes + (if with_compiler then [
         "<graal>/common.json",
         "<graal>/compiler/**",
diff --git a/espresso/mx.espresso/suite.py b/espresso/mx.espresso/suite.py
@@ -22,7 +22,7 @@
 #
 
 suite = {
-    "mxversion": "6.44.0",
+    "mxversion": "7.27.0",
     "name": "espresso",
     "version" : "24.2.0",
     "release" : False,
diff --git a/regex/mx.regex/suite.py b/regex/mx.regex/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion": "6.27.1",
+  "mxversion": "7.27.0",
 
   "name" : "regex",
 
diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion": "7.22.0",
+  "mxversion": "7.27.0",
   "name" : "sdk",
   "version" : "24.2.0",
   "release" : False,
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -1,6 +1,6 @@
 # pylint: disable=line-too-long
 suite = {
-    "mxversion": "7.13.2",
+    "mxversion": "7.27.0",
     "name": "substratevm",
     "version" : "24.2.0",
     "release" : False,
@@ -106,7 +106,7 @@
                         "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.llvm.linux.arm64"
                     },
                     "riscv64": {
-                        "sha1": "51762767783b9997474397cfac1e5d1a0ad59e2f",
+                        "digest": "sha512:e5bd006664ffadc7ef4c90fbc783a649e3a973ae2a10e76f0b8c2dd5363822ac0b120fd8639b22adf0dd9a3fc190cefa319854bdb2175cb30d6ac76aac358d8e",
                         "urls": ["{urlbase}/llvm-shadowed-13.0.1-1.5.7-linux-riscv64.jar"],
                         "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.llvm.linux.riscv64"
                     },
@@ -147,7 +147,7 @@
                         "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.javacpp.linux.arm64"
                     },
                     "riscv64": {
-                        "sha1": "b00dee62b202898ec899cb7bc03604247d648ceb",
+                        "digest": "sha512:95b1a2648ae2325fb581dfcc0d8ca86b0de5ef7471d733c6da84c739df4ce32555591b529192639086130a93bab32b771df4ee9317357101bf0b123b67af2764",
                         "urls": ["{urlbase}/javacpp-shadowed-1.5.7-linux-riscv64.jar"],
                         "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.javacpp.linux.riscv64"
                     },
diff --git a/sulong/ci/ci.jsonnet b/sulong/ci/ci.jsonnet
@@ -25,7 +25,7 @@ local sc = (import "ci_common/sulong-common.jsonnet");
         + ['--include=' + e for e in  self.guard.includes]
     ],
     guard+: {
-      includes: [
+      includes+: [
         # sulong and its dependencies
         "<graal>/.git/**",
         "<graal>/sdk/**",
@@ -43,6 +43,7 @@ local sc = (import "ci_common/sulong-common.jsonnet");
         "<graal>/vm/**",
       ] else []) + (if style then [
         "<graal>/.clang-format",
+        "<graal>/pyproject.toml",
       ] else []),
     },
   },
diff --git a/sulong/mx.sulong/suite.py b/sulong/mx.sulong/suite.py
@@ -1,5 +1,5 @@
 suite = {
-  "mxversion": "6.43.0",
+  "mxversion": "7.27.0",
   "name" : "sulong",
   "versionConflictResolution" : "latest",
   "groupId": "org.graalvm.llvm",
@@ -91,7 +91,7 @@
         "windows": {
           "<others>" : {
             "path": "tests/support.txt",
-            "sha1": "9b3f44dd60da58735fce6b7346b4b3ef571b768e",
+            "digest": "sha512:c02b248975b267f4200603ff2ae40b9d0cdefad4a792f386d610f2b14fb4e67e288c235fd11ed596dd8c91a3dae62fdd741bf97b5c01b5f085485f221702f0a1",
           },
         },
         "<others>": {"<others>" : {"optional": True}},
diff --git a/tools/mx.tools/suite.py b/tools/mx.tools/suite.py
@@ -21,7 +21,7 @@
 # questions.
 #
 suite = {
-    "mxversion": "6.41.0",
+    "mxversion": "7.27.0",
     "name": "tools",
     "defaultLicense" : "GPLv2-CPE",
 
diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion": "7.19.3",
+  "mxversion": "7.27.0",
   "name" : "truffle",
   "version" : "24.2.0",
   "release" : False,
@@ -196,8 +196,8 @@
     },
 
     "JIMFS" : {
-      "sha1": "48462eb319817c90c27d377341684b6b81372e08",
-      "sourceSha1": "bc1cd4901ef5f6ed1f62fe2e876758ce081e2aba",
+      "digest": "sha512:0a9df2cd8e0073545582cec28932ee91c75dcd61b06cd0a3bc9ab46527d149379d929e866a54758e6c110569359bec2b45b50a97b046356014e8302cd84544eb",
+      "sourceDigest": "sha512:407414fac32f435bdb0f3ac8fdd367f87044867d62a17818a4d98070a4d292525470366a68348bf99b596a38460cd1ced6fe38b97b1aae67642e6c231747bb8f",
       "maven": {
         "groupId": "com.google.jimfs",
         "artifactId": "jimfs",
@@ -207,8 +207,8 @@
 
     "GUAVA": { # JIMFS dependency
       "moduleName": "com.google.common",
-      "sha1": "119ea2b2bc205b138974d351777b20f02b92704b",
-      "sourceSha1": "d34772c01bd6637982d1aafe895c4fcd8b42e139",
+      "digest": "sha512:c8d8aa38e6fb04c409c37922efcbbe182f65156a853f691d8381d56eea208adf22f7a28873bb7895210e41857dd4411aaf952682a2692051220e281910d0798f",
+      "sourceDigest": "sha512:52ab5b63592f6137f98cf4a1b754f34550cc3636913c07407775b52e7249386c7710ffb9b4f26f173b2f8ad67d6575b3d07327492f7687032261815b0a4f4b7b",
       "maven": {
         "groupId": "com.google.guava",
         "artifactId": "guava",
diff --git a/visualizer/mx.visualizer/suite.py b/visualizer/mx.visualizer/suite.py
@@ -21,7 +21,7 @@
 # questions.
 
 suite = {
-  "mxversion": "6.27.1",
+  "mxversion": "7.27.0",
   "name" : "visualizer",
 
 
@@ -39,10 +39,10 @@
         "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/spotbugs-3.1.11.zip",
         "https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs/3.1.11/spotbugs-3.1.11.zip",
       ],
-      "sha1" : "8f961e0ddd445cc4e89b18563ac5730766d220f1",
+      "digest" : "sha512:98572754ab2df4ebc604d286fb8d83a7a053827d522df933cda3bc51f55f22a4123dad34a92954fdcaa3a81bd41dd466fa7ac1c7e4de980101fecef9905763a9",
     },
     "APACHE_BATIK_SVGGEN_1.12" : {
-      "sha1" : "53364380c4fb33ba49ddf25a56852bf405f698df",
+      "digest" : "sha512:c2519ddbaab53123a5cbfaa04aa388de71996e1af97d51ccf9bb527ca320d7fe3f0d6d0badff4e8138b3b1b0ec3c150a894c9c06c3845318afbc7466395d5565",
       "maven" : {
         "groupId" : "org.apache.xmlgraphics",
         "artifactId" : "batik-svggen",
@@ -52,7 +52,7 @@
     },
     "OPENIDE_UTIL_LOOKUP" : {
       "moduleName" : "org.openide.util.Lookup",
-      "sha1" : "6256fe5f371593f8d1d7cd4e732da5979e9577b5",
+      "digest" : "sha512:21b4f34d2a5ae6259b4f69d18bcdde176f2298eb80ea4c20c5f24072b968857bb3a16c373cccf9cdf57faccfdfd34531a9a181a0bbf84290ad314756efd35cf9",
       "maven" : {
         "groupId" : "org.netbeans.api",
         "artifactId" : "org-openide-util-lookup",
@@ -62,7 +62,7 @@
     },
     "OPENIDE_UTIL" : {
       "moduleName" : "org.openide.util",
-      "sha1" : "1a22c1ff81b4c2a6d9bd52a32270d9087c767a04",
+      "digest" : "sha512:a1647e95633573d81b1b4bf648a834475b54cc0d3025294ecbc83685d62b9c8cc71200cd04728afa0af0ab0503bd9029b15dd587a25285643e2aee2f751944be",
       "maven" : {
         "groupId" : "org.netbeans.api",
         "artifactId" : "org-openide-util",
diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -1,7 +1,7 @@
 suite = {
     "name": "vm",
     "version" : "24.2.0",
-    "mxversion": "6.41.0",
+    "mxversion": "7.27.0",
     "release" : False,
     "groupId" : "org.graalvm",
 
diff --git a/wasm/mx.wasm/suite.py b/wasm/mx.wasm/suite.py
@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion": "6.41.0",
+  "mxversion": "7.27.0",
   "name" : "wasm",
   "groupId" : "org.graalvm.wasm",
   "version" : "24.2.0",
@@ -68,7 +68,7 @@
   },
   "libraries": {
     "JOL": {
-      "sha1" : "553a2ba27f58b71e7efb545d7d3c657761f5b596",
+      "digest" : "sha512:8adfb561c82f9b198d1d8b7bea605fc8f4418d3e199d0d6262014dc75cee5b1a2ff59ec838b6322f5ee981e7094dbc3c9fa61ee5e8bfe7793aa927e2a900c6ec",
       "maven" : {
         "groupId" : "org.openjdk.jol",
         "artifactId" : "jol-core",

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`#`
`23`	`23`
`24`	`24`	`suite = {`
`25`		`- "mxversion": "6.44.0",`
	`25`	`+ "mxversion": "7.27.0",`
`26`	`26`	`"name": "espresso",`
`27`	`27`	`"version" : "24.2.0",`
`28`	`28`	`"release" : False,`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`# SOFTWARE.`
`40`	`40`	`#`
`41`	`41`	`suite = {`
`42`		`- "mxversion": "6.27.1",`
	`42`	`+ "mxversion": "7.27.0",`
`43`	`43`
`44`	`44`	`"name" : "regex",`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`# questions.`
`22`	`22`	`#`
`23`	`23`	`suite = {`
`24`		`- "mxversion": "6.41.0",`
	`24`	`+ "mxversion": "7.27.0",`
`25`	`25`	`"name": "tools",`
`26`	`26`	`"defaultLicense" : "GPLv2-CPE",`
`27`	`27`