Merge #500

500: Require at least RegistryTools 2.2, and fix the integration tests for the new `jll/` directory r=DilumAluthge a=DilumAluthge So that we get the new location of `_jll` packages. Co-authored-by: Dilum Aluthge <[email protected]>
JuliaRegistries · Mar 11, 2023 · dd49adb · dd49adb · DilumAluthge · Mar 11, 2023
2 parents 413df5a + 75429a6
commit dd49adb
Show file tree

Hide file tree

Showing 21 changed files with 6 additions and 6 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "RegistryCI"
 uuid = "0c95cc5f-2f7e-43fe-82dd-79dbcba86b32"
 authors = ["Dilum Aluthge <[email protected]>", "Fredrik Ekre <[email protected]>", "contributors"]
-version = "8.2.0"
+version = "8.3.0"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -29,7 +29,7 @@ GitHub = "5.2"
 HTTP = "0.8, 0.9.1, 1"
 JSON = "0.19, 0.20, 0.21"
 LicenseCheck = "0.2"
-RegistryTools = "1.5.5"
+RegistryTools = "2.2"
 SimpleMock = "1"
 StringDistances = "0.9, 0.10, 0.11"
 TOML = "1"

diff --git a/test/templates/feature_6/Registry.toml b/test/templates/feature_6/Registry.toml
@@ -5,4 +5,4 @@ repo = ""
 description = "This is a test registry for the AutoMerge integration tests."
 
 [packages]
-dca1746e-5efc-54fc-8249-22745bc95a49 = { name = "HelloWorldC_jll", path = "H/HelloWorldC_jll" }
+dca1746e-5efc-54fc-8249-22745bc95a49 = { name = "HelloWorldC_jll", path = "jll/H/HelloWorldC_jll" }
diff --git a/...s/feature_6/H/HelloWorldC_jll/Compat.toml → ...ature_6/jll/H/HelloWorldC_jll/Compat.toml b/...s/feature_6/H/HelloWorldC_jll/Compat.toml → ...ature_6/jll/H/HelloWorldC_jll/Compat.toml
diff --git a/...tes/feature_6/H/HelloWorldC_jll/Deps.toml → ...feature_6/jll/H/HelloWorldC_jll/Deps.toml b/...tes/feature_6/H/HelloWorldC_jll/Deps.toml → ...feature_6/jll/H/HelloWorldC_jll/Deps.toml
diff --git a/.../feature_6/H/HelloWorldC_jll/Package.toml → ...ture_6/jll/H/HelloWorldC_jll/Package.toml b/.../feature_6/H/HelloWorldC_jll/Package.toml → ...ture_6/jll/H/HelloWorldC_jll/Package.toml
diff --git a/...feature_6/H/HelloWorldC_jll/Versions.toml → ...ure_6/jll/H/HelloWorldC_jll/Versions.toml b/...feature_6/H/HelloWorldC_jll/Versions.toml → ...ure_6/jll/H/HelloWorldC_jll/Versions.toml
diff --git a/test/templates/feature_7/Registry.toml b/test/templates/feature_7/Registry.toml
@@ -5,4 +5,4 @@ repo = ""
 description = "This is a test registry for the AutoMerge integration tests."
 
 [packages]
-dca1746e-5efc-54fc-8249-22745bc95a49 = { name = "HelloWorldC_jll", path = "H/HelloWorldC_jll" }
+dca1746e-5efc-54fc-8249-22745bc95a49 = { name = "HelloWorldC_jll", path = "jll/H/HelloWorldC_jll" }
diff --git a/...s/feature_7/H/HelloWorldC_jll/Compat.toml → ...ature_7/jll/H/HelloWorldC_jll/Compat.toml b/...s/feature_7/H/HelloWorldC_jll/Compat.toml → ...ature_7/jll/H/HelloWorldC_jll/Compat.toml
diff --git a/...tes/feature_7/H/HelloWorldC_jll/Deps.toml → ...feature_7/jll/H/HelloWorldC_jll/Deps.toml b/...tes/feature_7/H/HelloWorldC_jll/Deps.toml → ...feature_7/jll/H/HelloWorldC_jll/Deps.toml
diff --git a/.../feature_7/H/HelloWorldC_jll/Package.toml → ...ture_7/jll/H/HelloWorldC_jll/Package.toml b/.../feature_7/H/HelloWorldC_jll/Package.toml → ...ture_7/jll/H/HelloWorldC_jll/Package.toml
diff --git a/...feature_7/H/HelloWorldC_jll/Versions.toml → ...ure_7/jll/H/HelloWorldC_jll/Versions.toml b/...feature_7/H/HelloWorldC_jll/Versions.toml → ...ure_7/jll/H/HelloWorldC_jll/Versions.toml
diff --git a/test/templates/feature_8/Registry.toml b/test/templates/feature_8/Registry.toml
@@ -5,4 +5,4 @@ repo = ""
 description = "This is a test registry for the AutoMerge integration tests."
 
 [packages]
-dca1746e-5efc-54fc-8249-22745bc95a49 = { name = "HelloWorldC_jll", path = "H/HelloWorldC_jll" }
+dca1746e-5efc-54fc-8249-22745bc95a49 = { name = "HelloWorldC_jll", path = "jll/H/HelloWorldC_jll" }
diff --git a/...s/feature_8/H/HelloWorldC_jll/Compat.toml → ...ature_8/jll/H/HelloWorldC_jll/Compat.toml b/...s/feature_8/H/HelloWorldC_jll/Compat.toml → ...ature_8/jll/H/HelloWorldC_jll/Compat.toml
diff --git a/...tes/feature_8/H/HelloWorldC_jll/Deps.toml → ...feature_8/jll/H/HelloWorldC_jll/Deps.toml b/...tes/feature_8/H/HelloWorldC_jll/Deps.toml → ...feature_8/jll/H/HelloWorldC_jll/Deps.toml
diff --git a/.../feature_8/H/HelloWorldC_jll/Package.toml → ...ture_8/jll/H/HelloWorldC_jll/Package.toml b/.../feature_8/H/HelloWorldC_jll/Package.toml → ...ture_8/jll/H/HelloWorldC_jll/Package.toml
diff --git a/...feature_8/H/HelloWorldC_jll/Versions.toml → ...ure_8/jll/H/HelloWorldC_jll/Versions.toml b/...feature_8/H/HelloWorldC_jll/Versions.toml → ...ure_8/jll/H/HelloWorldC_jll/Versions.toml
diff --git a/test/templates/master_4/Registry.toml b/test/templates/master_4/Registry.toml
@@ -5,4 +5,4 @@ repo = ""
 description = "This is a test registry for the AutoMerge integration tests."
 
 [packages]
-dca1746e-5efc-54fc-8249-22745bc95a49 = { name = "HelloWorldC_jll", path = "H/HelloWorldC_jll" }
+dca1746e-5efc-54fc-8249-22745bc95a49 = { name = "HelloWorldC_jll", path = "jll/H/HelloWorldC_jll" }
diff --git a/...es/master_4/H/HelloWorldC_jll/Compat.toml → ...aster_4/jll/H/HelloWorldC_jll/Compat.toml b/...es/master_4/H/HelloWorldC_jll/Compat.toml → ...aster_4/jll/H/HelloWorldC_jll/Compat.toml
diff --git a/...ates/master_4/H/HelloWorldC_jll/Deps.toml → .../master_4/jll/H/HelloWorldC_jll/Deps.toml b/...ates/master_4/H/HelloWorldC_jll/Deps.toml → .../master_4/jll/H/HelloWorldC_jll/Deps.toml
diff --git a/...s/master_4/H/HelloWorldC_jll/Package.toml → ...ster_4/jll/H/HelloWorldC_jll/Package.toml b/...s/master_4/H/HelloWorldC_jll/Package.toml → ...ster_4/jll/H/HelloWorldC_jll/Package.toml
diff --git a/.../master_4/H/HelloWorldC_jll/Versions.toml → ...ter_4/jll/H/HelloWorldC_jll/Versions.toml b/.../master_4/H/HelloWorldC_jll/Versions.toml → ...ter_4/jll/H/HelloWorldC_jll/Versions.toml