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

Commits:

2 changed files:

Changes:

  • .gitlab/generate-ci/gen_ci.hs
    ... ... @@ -1329,7 +1329,6 @@ cross_jobs = [
    1329 1329
           modifyJobs
    
    1330 1330
             ( -- See Note [Testing wasm ghci browser mode]
    
    1331 1331
               setVariable "FIREFOX_LAUNCH_OPTS" "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}"
    
    1332
    -            . setVariable "CHROME_LAUNCH_OPTS" "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}"
    
    1333 1332
                 . setVariable "HADRIAN_ARGS" "--docs=no-sphinx-pdfs --docs=no-sphinx-man"
    
    1334 1333
                 . delVariable "INSTALL_CONFIGURE_ARGS"
    
    1335 1334
             )
    

  • .gitlab/jobs.yaml
    ... ... @@ -1786,7 +1786,6 @@
    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\"]}",
    
    1790 1789
           "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    1791 1790
           "CROSS_TARGET": "wasm32-wasi",
    
    1792 1791
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -1852,7 +1851,6 @@
    1852 1851
           "BIGNUM_BACKEND": "native",
    
    1853 1852
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    1854 1853
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    1855
    -      "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}",
    
    1856 1854
           "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    1857 1855
           "CROSS_TARGET": "wasm32-wasi",
    
    1858 1856
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -1918,7 +1916,6 @@
    1918 1916
           "BIGNUM_BACKEND": "gmp",
    
    1919 1917
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    1920 1918
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    1921
    -      "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}",
    
    1922 1919
           "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    1923 1920
           "CROSS_TARGET": "wasm32-wasi",
    
    1924 1921
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -6099,7 +6096,6 @@
    6099 6096
           "BIGNUM_BACKEND": "gmp",
    
    6100 6097
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    6101 6098
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    6102
    -      "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}",
    
    6103 6099
           "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    6104 6100
           "CROSS_TARGET": "wasm32-wasi",
    
    6105 6101
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -6165,7 +6161,6 @@
    6165 6161
           "BIGNUM_BACKEND": "native",
    
    6166 6162
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    6167 6163
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    6168
    -      "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}",
    
    6169 6164
           "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    6170 6165
           "CROSS_TARGET": "wasm32-wasi",
    
    6171 6166
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -6231,7 +6226,6 @@
    6231 6226
           "BIGNUM_BACKEND": "gmp",
    
    6232 6227
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_20-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    6233 6228
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    6234
    -      "CHROME_LAUNCH_OPTS": "{\"browser\":\"chrome\",\"protocol\":\"webDriverBiDi\",\"executablePath\":\"/usr/bin/chromium\",\"args\":[\"--no-sandbox\"]}",
    
    6235 6229
           "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    6236 6230
           "CROSS_TARGET": "wasm32-wasi",
    
    6237 6231
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",