diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-03-31 13:36:45 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-04-01 10:35:53 +0100 |
| commit | acfd5a4c4f0a235240a15dc9f4417a11ece5a143 (patch) | |
| tree | df58b1782cf943f9806c0f8c60efdb9c3af5f7de | |
| parent | 7847f47a72a25ae6b4523907e452b666d72d0d28 (diff) | |
| download | haskell-acfd5a4c4f0a235240a15dc9f4417a11ece5a143.tar.gz | |
ci: Regenerate jobs.yaml
It seems I forgot to update this to reflect the current state of
gen_ci.hs
| -rwxr-xr-x | .gitlab/gen_ci.hs | 8 | ||||
| -rw-r--r-- | .gitlab/jobs.yaml | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index c1099d846e..14cd5cbdf4 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -351,6 +351,14 @@ distroVariables Alpine = mconcat -- (see Note [Object unloading]). , "BROKEN_TESTS" =: "encoding004 T10458 ghcilink002 linker_unload_native" ] +distroVariables Fedora33 = mconcat + -- LLC/OPT do not work for some reason in our fedora images + -- These tests fail with this error: T11649 T5681 T7571 T8131b + -- +/opt/llvm/bin/opt: /lib64/libtinfo.so.5: no version information available (required by /opt/llvm/bin/opt) +-- +/opt/llvm/bin/llc: /lib64/libtinfo.so.5: no version information available (required by /opt/llvm/bin/llc) + [ "LLC" =: "/bin/false" + , "OPT" =: "/bin/false" + ] distroVariables _ = mempty ----------------------------------------------------------------------------- diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index 5101835e93..90cb8d55a9 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -1533,7 +1533,6 @@ "HADRIAN_ARGS": "--docs=no-sphinx", "LANG": "en_US.UTF-8", "MSYSTEM": "MINGW64", - "SPHINXBUILD": "/mingw64/bin/sphinx-build.exe", "TEST_ENV": "x86_64-windows-int_native-validate", "XZ_OPT": "-9" } @@ -1596,7 +1595,6 @@ "HADRIAN_ARGS": "--docs=no-sphinx", "LANG": "en_US.UTF-8", "MSYSTEM": "MINGW64", - "SPHINXBUILD": "/mingw64/bin/sphinx-build.exe", "TEST_ENV": "x86_64-windows-validate", "XZ_OPT": "-9" } @@ -2567,7 +2565,6 @@ "IGNORE_PERF_FAILURES": "all", "LANG": "en_US.UTF-8", "MSYSTEM": "MINGW64", - "SPHINXBUILD": "/mingw64/bin/sphinx-build.exe", "TEST_ENV": "x86_64-windows-int_native-perf", "XZ_OPT": "-9" } @@ -2631,7 +2628,6 @@ "IGNORE_PERF_FAILURES": "all", "LANG": "en_US.UTF-8", "MSYSTEM": "MINGW64", - "SPHINXBUILD": "/mingw64/bin/sphinx-build.exe", "TEST_ENV": "x86_64-windows-perf", "XZ_OPT": "-9" } @@ -3686,7 +3682,6 @@ "HADRIAN_ARGS": "--docs=no-sphinx", "LANG": "en_US.UTF-8", "MSYSTEM": "MINGW64", - "SPHINXBUILD": "/mingw64/bin/sphinx-build.exe", "TEST_ENV": "x86_64-windows-int_native-validate" } }, @@ -3748,7 +3743,6 @@ "HADRIAN_ARGS": "--docs=no-sphinx", "LANG": "en_US.UTF-8", "MSYSTEM": "MINGW64", - "SPHINXBUILD": "/mingw64/bin/sphinx-build.exe", "TEST_ENV": "x86_64-windows-validate" } } |