Merge pull request #21977 from kit-ty-kate/fix-135

kit-ty-kate · web-flow · commit a3b76ad800e9 · 2022-08-12T18:51:40.000+01:00
Disable the tests of dune-release &gt;= 1.5.0 when using opam &gt;= 2.2
diff --git a/packages/dune-release/dune-release.1.5.0/opam b/packages/dune-release/dune-release.1.5.0/opam
@@ -11,7 +11,7 @@ build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "clean"] {with-test}
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test & opam-version < "2.2"}
 ]
 
 depends: [
diff --git a/packages/dune-release/dune-release.1.5.1/opam b/packages/dune-release/dune-release.1.5.1/opam
@@ -49,7 +49,7 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+    "@runtest" {with-test & opam-version < "2.2"}
     "@doc" {with-doc}
   ]
 ]
diff --git a/packages/dune-release/dune-release.1.5.2/opam b/packages/dune-release/dune-release.1.5.2/opam
@@ -46,7 +46,7 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test & !(os-distribution = "centos" & os-version < "8") & !(os-distribution = "ol" & os-version < "8")} # Disable the tests on distributions that have old versions of git
+    "@runtest" {with-test & opam-version < "2.2" & !(os-distribution = "centos" & os-version < "8") & !(os-distribution = "ol" & os-version < "8")} # Disable the tests on distributions that have old versions of git
     "@doc" {with-doc}
   ]
 ]
diff --git a/packages/dune-release/dune-release.1.6.0/opam b/packages/dune-release/dune-release.1.6.0/opam
@@ -46,7 +46,7 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+    "@runtest" {with-test & opam-version < "2.2"}
     "@doc" {with-doc}
   ]
 ]
diff --git a/packages/dune-release/dune-release.1.6.1/opam b/packages/dune-release/dune-release.1.6.1/opam
@@ -46,7 +46,7 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+    "@runtest" {with-test & opam-version < "2.2"}
     "@doc" {with-doc}
   ]
 ]
diff --git a/packages/dune-release/dune-release.1.6.2/opam b/packages/dune-release/dune-release.1.6.2/opam
@@ -46,7 +46,7 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+    "@runtest" {with-test & opam-version < "2.2"}
     "@doc" {with-doc}
   ]
 ]

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ build: [`
`11`	`11`	`["dune" "subst"] {dev}`
`12`	`12`	`["dune" "build" "-p" name "-j" jobs]`
`13`	`13`	`["dune" "clean"] {with-test}`
`14`		`- ["dune" "runtest" "-p" name "-j" jobs] {with-test}`
	`14`	`+ ["dune" "runtest" "-p" name "-j" jobs] {with-test & opam-version < "2.2"}`
`15`	`15`	`]`
`16`	`16`
`17`	`17`	`depends: [`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ build: [`
`49`	`49`	`"-j"`
`50`	`50`	`jobs`
`51`	`51`	`"@install"`
`52`		`- "@runtest" {with-test}`
	`52`	`+ "@runtest" {with-test & opam-version < "2.2"}`
`53`	`53`	`"@doc" {with-doc}`
`54`	`54`	`]`
`55`	`55`	`]`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ build: [`
`46`	`46`	`"-j"`
`47`	`47`	`jobs`
`48`	`48`	`"@install"`
`49`		`- "@runtest" {with-test & !(os-distribution = "centos" & os-version < "8") & !(os-distribution = "ol" & os-version < "8")} # Disable the tests on distributions that have old versions of git`
	`49`	`+ "@runtest" {with-test & opam-version < "2.2" & !(os-distribution = "centos" & os-version < "8") & !(os-distribution = "ol" & os-version < "8")} # Disable the tests on distributions that have old versions of git`
`50`	`50`	`"@doc" {with-doc}`
`51`	`51`	`]`
`52`	`52`	`]`