[GR-37553] Prepare 22.1.

gilles-duboscq · gilles-duboscq · commit b3941057b7df · 2022-03-20T20:37:13.000Z
PullRequest: js/2384
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -7,7 +7,7 @@ local defs = import 'defs.jsonnet';
   // Used to run fewer jobs
   local debug = false,
 
-  local overlay = 'a892aea0a53f23cb522447fdeee08ac172ebd59c',
+  local overlay = 'ebdbbc69acb39ec69dc6bdc6c1f616227edc1931',
 
   local no_overlay = 'cb733e564850cd37b685fcef6f3c16b59802b22c',
 
diff --git a/common.json b/common.json
@@ -96,11 +96,16 @@
           "cmake": "==3.15.2"
         }
       },
-      "darwin": {
+      "darwin_amd64": {
         "packages": {
           "cmake": "==3.15.2"
         }
       },
+      "darwin_aarch64": {
+        "packages": {
+          "cmake": "==3.22.2"
+        }
+      },
       "windows": {
         "packages": {
           "msvc": "==10.0",
@@ -165,7 +170,8 @@
           "ruby": ">=2.1.0"
         }
       },
-      "darwin": {},
+      "darwin_amd64": {},
+      "darwin_aarch64": {},
       "windows": {}
     }
   }
diff --git a/common.jsonnet b/common.jsonnet
@@ -84,7 +84,7 @@ local common_json = (import "common.json");
   darwin: common + {
     os:: 'darwin',
     arch:: 'amd64',
-    packages+: common_json.sulong.deps.darwin.packages,
+    packages+: common_json.sulong.deps.darwin_amd64.packages,
     environment+: {
       // for compatibility with macOS El Capitan
       MACOSX_DEPLOYMENT_TARGET: '10.11',
diff --git a/graal-js/mx.graal-js/suite.py b/graal-js/mx.graal-js/suite.py
@@ -24,7 +24,7 @@
         {
            "name" : "regex",
            "subdir" : True,
-           "version" : "abedb7b4840e42d943f36d93b52caf189bf8a776",
+           "version" : "dc6d58f4b9415dab2e0a2a6df27943b65f8e0cad",
            "urls" : [
                 {"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
                 {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},

Original file line number	Diff line number	Diff line change
`@@ -96,11 +96,16 @@`
`96`	`96`	`"cmake": "==3.15.2"`
`97`	`97`	`}`
`98`	`98`	`},`
`99`		`- "darwin": {`
	`99`	`+ "darwin_amd64": {`
`100`	`100`	`"packages": {`
`101`	`101`	`"cmake": "==3.15.2"`
`102`	`102`	`}`
`103`	`103`	`},`
	`104`	`+ "darwin_aarch64": {`
	`105`	`+ "packages": {`
	`106`	`+ "cmake": "==3.22.2"`
	`107`	`+ }`
	`108`	`+ },`
`104`	`109`	`"windows": {`
`105`	`110`	`"packages": {`
`106`	`111`	`"msvc": "==10.0",`
`@@ -165,7 +170,8 @@`
`165`	`170`	`"ruby": ">=2.1.0"`
`166`	`171`	`}`
`167`	`172`	`},`
`168`		`- "darwin": {},`
	`173`	`+ "darwin_amd64": {},`
	`174`	`+ "darwin_aarch64": {},`
`169`	`175`	`"windows": {}`
`170`	`176`	`}`
`171`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`{`
`25`	`25`	`"name" : "regex",`
`26`	`26`	`"subdir" : True,`
`27`		`- "version" : "abedb7b4840e42d943f36d93b52caf189bf8a776",`
	`27`	`+ "version" : "dc6d58f4b9415dab2e0a2a6df27943b65f8e0cad",`
`28`	`28`	`"urls" : [`
`29`	`29`	`{"url" : "https://github.com/oracle/graal.git", "kind" : "git"},`
`30`	`30`	`{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},`