Skip to content

Commit e5a3887

Browse files
authored
Merge pull request #28865 from art-w/fix-solo5-duplicate-fields
fix: solo5 declares x-ci-accept-failures twice
2 parents 98c5d1e + 5f5b9b5 commit e5a3887

File tree

3 files changed

+3
-6
lines changed
  • packages/solo5

3 files changed

+3
-6
lines changed

packages/solo5/solo5.0.10.0/opam

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ available: [
3737
(arch = "x86_64" | arch = "arm64" | arch = "ppc64") &
3838
(os = "linux" | os = "freebsd" | os = "openbsd")
3939
]
40-
x-ci-accept-failures: [ "centos-7" ]
4140
synopsis: "Solo5 sandboxed execution environment"
4241
description: """
4342
Solo5 is a sandboxed execution environment primarily intended
@@ -48,7 +47,7 @@ This package provides the Solo5 components needed to build and
4847
run MirageOS unikernels on the host system.
4948
"""
5049
x-maintenance-intent: [ "(latest)" ]
51-
x-ci-accept-failures: [ "opensuse-15.6" ] # too old GCC compiler (OpenSUSE uses GCC 7 and we require GCC 10)
50+
x-ci-accept-failures: [ "centos-7" "opensuse-15.6" ] # too old GCC compiler (OpenSUSE uses GCC 7 and we require GCC 10)
5251
url {
5352
src: "https://github.com/Solo5/solo5/releases/download/v0.10.0/solo5-v0.10.0.tar.gz"
5453
checksum: "sha512=fadc0f0920b3c77f828f5396db267755a9b45fb19b44970f2363224a91a11ba8593fe27caf3c14c321a52f993a6d21ec200f0eb950dd7bb0f5bbe5f7102aba5f"

packages/solo5/solo5.0.9.2/opam

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ available: [
3838
(os = "linux" | os = "freebsd" | os = "openbsd") &
3939
os-family != "opensuse"
4040
]
41-
x-ci-accept-failures: [ "centos-7" ]
4241
synopsis: "Solo5 sandboxed execution environment"
4342
description: """
4443
Solo5 is a sandboxed execution environment primarily intended
@@ -53,4 +52,4 @@ url {
5352
src: "https://github.com/Solo5/solo5/releases/download/v0.9.2/solo5-v0.9.2.tar.gz"
5453
checksum: "sha512=a883461432f69fa2a74ca5b03df0f6a6149c1ce2abf8ae97af04d23734c4870ebefe43fe8e69b0ba6c88507b244d082cd6bc14ec4a4c8ef1a54d1fa9f05e8098"
5554
}
56-
x-ci-accept-failures: [ "opensuse-15.6" ] # too old GCC compiler (OpenSUSE uses GCC 7 and we require GCC 10)
55+
x-ci-accept-failures: [ "centos-7" "opensuse-15.6" ] # too old GCC compiler (OpenSUSE uses GCC 7 and we require GCC 10)

packages/solo5/solo5.0.9.3/opam

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ available: [
3737
(arch = "x86_64" | arch = "arm64" | arch = "ppc64") &
3838
(os = "linux" | os = "freebsd" | os = "openbsd")
3939
]
40-
x-ci-accept-failures: [ "centos-7" ]
4140
synopsis: "Solo5 sandboxed execution environment"
4241
description: """
4342
Solo5 is a sandboxed execution environment primarily intended
@@ -48,7 +47,7 @@ This package provides the Solo5 components needed to build and
4847
run MirageOS unikernels on the host system.
4948
"""
5049
x-maintenance-intent: [ "(latest)" ]
51-
x-ci-accept-failures: [ "opensuse-15.6" ] # too old GCC compiler (OpenSUSE uses GCC 7 and we require GCC 10)
50+
x-ci-accept-failures: [ "centos-7" "opensuse-15.6" ] # too old GCC compiler (OpenSUSE uses GCC 7 and we require GCC 10)
5251
url {
5352
src: "https://github.com/Solo5/solo5/releases/download/v0.9.3/solo5-v0.9.3.tar.gz"
5453
checksum: "sha512=e8eed5c0be0d5ee5f528ac91874363f4fded71618ed19bdbd354d303ed7fdc73394fd2531ccb780c579fa789e13181205d062e34c6e82916b072936ebaadf9dd"

0 commit comments

Comments
 (0)