Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • .gitlab/generate-ci/gen_ci.hs
    ... ... @@ -1322,6 +1322,7 @@ cross_jobs = [
    1322 1322
           modifyJobs
    
    1323 1323
             ( -- See Note [Testing wasm ghci browser mode]
    
    1324 1324
               setVariable "FIREFOX_LAUNCH_OPTS" "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}"
    
    1325
    +            . setVariable "CHROME_LAUNCH_OPTS" "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}"
    
    1325 1326
                 . setVariable "HADRIAN_ARGS" "--docs=no-sphinx-pdfs --docs=no-sphinx-man"
    
    1326 1327
                 . delVariable "INSTALL_CONFIGURE_ARGS"
    
    1327 1328
             )
    

  • .gitlab/jobs.yaml
    ... ... @@ -1786,6 +1786,7 @@
    1786 1786
           "BIGNUM_BACKEND": "gmp",
    
    1787 1787
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    1788 1788
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    1789
    +      "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}",
    
    1789 1790
           "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    1790 1791
           "CROSS_TARGET": "wasm32-wasi",
    
    1791 1792
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -1851,6 +1852,7 @@
    1851 1852
           "BIGNUM_BACKEND": "native",
    
    1852 1853
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    1853 1854
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    1855
    +      "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}",
    
    1854 1856
           "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    1855 1857
           "CROSS_TARGET": "wasm32-wasi",
    
    1856 1858
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -1916,6 +1918,7 @@
    1916 1918
           "BIGNUM_BACKEND": "gmp",
    
    1917 1919
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    1918 1920
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    1921
    +      "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}",
    
    1919 1922
           "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    1920 1923
           "CROSS_TARGET": "wasm32-wasi",
    
    1921 1924
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -6031,6 +6034,7 @@
    6031 6034
           "BIGNUM_BACKEND": "gmp",
    
    6032 6035
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    6033 6036
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    6037
    +      "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}",
    
    6034 6038
           "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    6035 6039
           "CROSS_TARGET": "wasm32-wasi",
    
    6036 6040
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -6096,6 +6100,7 @@
    6096 6100
           "BIGNUM_BACKEND": "native",
    
    6097 6101
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    6098 6102
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    6103
    +      "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}",
    
    6099 6104
           "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    6100 6105
           "CROSS_TARGET": "wasm32-wasi",
    
    6101 6106
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -6161,6 +6166,7 @@
    6161 6166
           "BIGNUM_BACKEND": "gmp",
    
    6162 6167
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    6163 6168
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    6169
    +      "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}",
    
    6164 6170
           "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    6165 6171
           "CROSS_TARGET": "wasm32-wasi",
    
    6166 6172
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",