diff options
-rw-r--r-- | .gitlab-ci.yml | 3 | ||||
-rwxr-xr-x | .gitlab/gen_ci.hs | 6 | ||||
-rw-r--r-- | .gitlab/jobs.yaml | 145 |
3 files changed, 74 insertions, 80 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6aea0edd2..ed4b42a3aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ variables: GIT_SSL_NO_VERIFY: "1" # Commit of ghc/ci-images repository from which to pull Docker images - DOCKER_REV: 572353e0644044fe3a5465bba4342a9a0b0eb60e + DOCKER_REV: b58ecd021c2533f0f0d0b1c9109200a69506d2b7 # Sequential version number of all cached things. # Bump to invalidate GitLab CI cache. @@ -1084,4 +1084,3 @@ ghcup-metadata-testing-release: rules: - if: '$RELEASE_JOB == "yes"' when: manual - diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index 267a2e240c..456d7f2257 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -114,6 +114,7 @@ data LinuxDistro | Ubuntu1804 | Centos7 | Alpine + | AlpineWasm | Rocky8 deriving (Eq) @@ -279,6 +280,7 @@ distroName Ubuntu1804 = "ubuntu18_04" distroName Ubuntu2004 = "ubuntu20_04" distroName Centos7 = "centos7" distroName Alpine = "alpine3_12" +distroName AlpineWasm = "alpine3_17-wasm" distroName Rocky8 = "rocky8" opsysName :: Opsys -> String @@ -646,7 +648,6 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} } , "bash .gitlab/ci.sh test_hadrian" ] | otherwise = [ "find libraries -name config.sub -exec cp config.sub {} \\;" | Darwin == opsys ] ++ - [ "sudo apk del --purge glibc*" | opsys == Linux Alpine, isNothing $ crossTarget buildConfig ] ++ [ "sudo chown ghc:ghc -R ." | Linux {} <- [opsys]] ++ [ ".gitlab/ci.sh setup" , ".gitlab/ci.sh configure" @@ -929,7 +930,7 @@ job_groups = . setVariable "HADRIAN_ARGS" "--docs=none" . delVariable "INSTALL_CONFIGURE_ARGS" ) - $ validateBuilds Amd64 (Linux Alpine) cfg + $ validateBuilds Amd64 (Linux AlpineWasm) cfg wasm_build_config = (crossConfig "wasm32-wasi" NoEmulatorNeeded Nothing) @@ -992,4 +993,3 @@ write_result as obj = [] -> B.putStrLn (fp:_) -> B.writeFile fp) (A.encode obj) - diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index 7c05374f6a..d1a70dfe4d 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -544,17 +544,17 @@ "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static": { + "nightly-x86_64-linux-alpine3_12-int_native-validate+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh clean", "cat ci_timings" ], - "allow_failure": false, + "allow_failure": true, "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static.tar.xz", + "ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static.tar.xz", "junit.xml" ], "reports": { @@ -595,17 +595,18 @@ "x86_64-linux" ], "variables": { - "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static", - "BUILD_FLAVOUR": "release+fully_static", - "CONFIGURE_ARGS": "--disable-ld-override --with-intree-gmp --with-system-libffi", - "CROSS_TARGET": "wasm32-wasi", - "HADRIAN_ARGS": "--docs=none", - "TEST_ENV": "x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static", + "BIGNUM_BACKEND": "native", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static", + "BROKEN_TESTS": "encoding004 T10458 ghcilink002 linker_unload_native", + "BUILD_FLAVOUR": "validate+fully_static", + "CONFIGURE_ARGS": "--disable-ld-override ", + "HADRIAN_ARGS": "--docs=no-sphinx", + "INSTALL_CONFIGURE_ARGS": "--disable-ld-override", + "TEST_ENV": "x86_64-linux-alpine3_12-int_native-validate+fully_static", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-alpine3_12-int_native-cross_wasm32-wasi-release+fully_static": { + "nightly-x86_64-linux-alpine3_12-validate+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh clean", @@ -615,7 +616,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_12-int_native-cross_wasm32-wasi-release+fully_static.tar.xz", + "ghc-x86_64-linux-alpine3_12-validate+fully_static.tar.xz", "junit.xml" ], "reports": { @@ -656,27 +657,28 @@ "x86_64-linux" ], "variables": { - "BIGNUM_BACKEND": "native", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-int_native-cross_wasm32-wasi-release+fully_static", - "BUILD_FLAVOUR": "release+fully_static", - "CONFIGURE_ARGS": "--disable-ld-override --with-intree-gmp --with-system-libffi", - "CROSS_TARGET": "wasm32-wasi", - "HADRIAN_ARGS": "--docs=none", - "TEST_ENV": "x86_64-linux-alpine3_12-int_native-cross_wasm32-wasi-release+fully_static", + "BIGNUM_BACKEND": "gmp", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate+fully_static", + "BROKEN_TESTS": "encoding004 T10458 ghcilink002 linker_unload_native", + "BUILD_FLAVOUR": "validate+fully_static", + "CONFIGURE_ARGS": "--disable-ld-override ", + "HADRIAN_ARGS": "--docs=no-sphinx", + "INSTALL_CONFIGURE_ARGS": "--disable-ld-override", + "TEST_ENV": "x86_64-linux-alpine3_12-validate+fully_static", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-alpine3_12-int_native-validate+fully_static": { + "nightly-x86_64-linux-alpine3_17-wasm-cross_wasm32-wasi-release+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh clean", "cat ci_timings" ], - "allow_failure": true, + "allow_failure": false, "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static.tar.xz", + "ghc-x86_64-linux-alpine3_17-wasm-cross_wasm32-wasi-release+fully_static.tar.xz", "junit.xml" ], "reports": { @@ -685,14 +687,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_12-$CACHE_REV", + "key": "x86_64-linux-alpine3_17-wasm-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_17-wasm:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -706,7 +708,6 @@ } ], "script": [ - "sudo apk del --purge glibc*", "sudo chown ghc:ghc -R .", ".gitlab/ci.sh setup", ".gitlab/ci.sh configure", @@ -718,18 +719,17 @@ "x86_64-linux" ], "variables": { - "BIGNUM_BACKEND": "native", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static", - "BROKEN_TESTS": "encoding004 T10458 ghcilink002 linker_unload_native", - "BUILD_FLAVOUR": "validate+fully_static", - "CONFIGURE_ARGS": "--disable-ld-override ", - "HADRIAN_ARGS": "--docs=no-sphinx", - "INSTALL_CONFIGURE_ARGS": "--disable-ld-override", - "TEST_ENV": "x86_64-linux-alpine3_12-int_native-validate+fully_static", + "BIGNUM_BACKEND": "gmp", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_17-wasm-cross_wasm32-wasi-release+fully_static", + "BUILD_FLAVOUR": "release+fully_static", + "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi", + "CROSS_TARGET": "wasm32-wasi", + "HADRIAN_ARGS": "--docs=none", + "TEST_ENV": "x86_64-linux-alpine3_17-wasm-cross_wasm32-wasi-release+fully_static", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-alpine3_12-unreg-cross_wasm32-wasi-release+fully_static": { + "nightly-x86_64-linux-alpine3_17-wasm-int_native-cross_wasm32-wasi-release+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh clean", @@ -739,7 +739,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_12-unreg-cross_wasm32-wasi-release+fully_static.tar.xz", + "ghc-x86_64-linux-alpine3_17-wasm-int_native-cross_wasm32-wasi-release+fully_static.tar.xz", "junit.xml" ], "reports": { @@ -748,14 +748,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_12-$CACHE_REV", + "key": "x86_64-linux-alpine3_17-wasm-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_17-wasm:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -780,17 +780,17 @@ "x86_64-linux" ], "variables": { - "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-unreg-cross_wasm32-wasi-release+fully_static", + "BIGNUM_BACKEND": "native", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_17-wasm-int_native-cross_wasm32-wasi-release+fully_static", "BUILD_FLAVOUR": "release+fully_static", - "CONFIGURE_ARGS": "--disable-ld-override --enable-unregisterised --with-intree-gmp --with-system-libffi", + "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi", "CROSS_TARGET": "wasm32-wasi", "HADRIAN_ARGS": "--docs=none", - "TEST_ENV": "x86_64-linux-alpine3_12-unreg-cross_wasm32-wasi-release+fully_static", + "TEST_ENV": "x86_64-linux-alpine3_17-wasm-int_native-cross_wasm32-wasi-release+fully_static", "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-alpine3_12-validate+fully_static": { + "nightly-x86_64-linux-alpine3_17-wasm-unreg-cross_wasm32-wasi-release+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh clean", @@ -800,7 +800,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_12-validate+fully_static.tar.xz", + "ghc-x86_64-linux-alpine3_17-wasm-unreg-cross_wasm32-wasi-release+fully_static.tar.xz", "junit.xml" ], "reports": { @@ -809,14 +809,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_12-$CACHE_REV", + "key": "x86_64-linux-alpine3_17-wasm-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_17-wasm:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -830,7 +830,6 @@ } ], "script": [ - "sudo apk del --purge glibc*", "sudo chown ghc:ghc -R .", ".gitlab/ci.sh setup", ".gitlab/ci.sh configure", @@ -843,13 +842,12 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate+fully_static", - "BROKEN_TESTS": "encoding004 T10458 ghcilink002 linker_unload_native", - "BUILD_FLAVOUR": "validate+fully_static", - "CONFIGURE_ARGS": "--disable-ld-override ", - "HADRIAN_ARGS": "--docs=no-sphinx", - "INSTALL_CONFIGURE_ARGS": "--disable-ld-override", - "TEST_ENV": "x86_64-linux-alpine3_12-validate+fully_static", + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_17-wasm-unreg-cross_wasm32-wasi-release+fully_static", + "BUILD_FLAVOUR": "release+fully_static", + "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi", + "CROSS_TARGET": "wasm32-wasi", + "HADRIAN_ARGS": "--docs=none", + "TEST_ENV": "x86_64-linux-alpine3_17-wasm-unreg-cross_wasm32-wasi-release+fully_static", "XZ_OPT": "-9" } }, @@ -2459,7 +2457,6 @@ } ], "script": [ - "sudo apk del --purge glibc*", "sudo chown ghc:ghc -R .", ".gitlab/ci.sh setup", ".gitlab/ci.sh configure", @@ -2523,7 +2520,6 @@ } ], "script": [ - "sudo apk del --purge glibc*", "sudo chown ghc:ghc -R .", ".gitlab/ci.sh setup", ".gitlab/ci.sh configure", @@ -3521,7 +3517,7 @@ "TEST_ENV": "x86_64-freebsd13-validate" } }, - "x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static": { + "x86_64-linux-alpine3_12-validate+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh clean", @@ -3531,7 +3527,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static.tar.xz", + "ghc-x86_64-linux-alpine3_12-validate+fully_static.tar.xz", "junit.xml" ], "reports": { @@ -3573,15 +3569,16 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static", - "BUILD_FLAVOUR": "release+fully_static", - "CONFIGURE_ARGS": "--disable-ld-override --with-intree-gmp --with-system-libffi", - "CROSS_TARGET": "wasm32-wasi", - "HADRIAN_ARGS": "--docs=none", - "TEST_ENV": "x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static" + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate+fully_static", + "BROKEN_TESTS": "encoding004 T10458 ghcilink002 linker_unload_native", + "BUILD_FLAVOUR": "validate+fully_static", + "CONFIGURE_ARGS": "--disable-ld-override ", + "HADRIAN_ARGS": "--docs=no-sphinx", + "INSTALL_CONFIGURE_ARGS": "--disable-ld-override", + "TEST_ENV": "x86_64-linux-alpine3_12-validate+fully_static" } }, - "x86_64-linux-alpine3_12-validate+fully_static": { + "x86_64-linux-alpine3_17-wasm-cross_wasm32-wasi-release+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh clean", @@ -3591,7 +3588,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-alpine3_12-validate+fully_static.tar.xz", + "ghc-x86_64-linux-alpine3_17-wasm-cross_wasm32-wasi-release+fully_static.tar.xz", "junit.xml" ], "reports": { @@ -3600,14 +3597,14 @@ "when": "always" }, "cache": { - "key": "x86_64-linux-alpine3_12-$CACHE_REV", + "key": "x86_64-linux-alpine3_17-wasm-$CACHE_REV", "paths": [ "cabal-cache", "toolchain" ] }, "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV", + "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_17-wasm:$DOCKER_REV", "needs": [ { "artifacts": false, @@ -3621,7 +3618,6 @@ } ], "script": [ - "sudo apk del --purge glibc*", "sudo chown ghc:ghc -R .", ".gitlab/ci.sh setup", ".gitlab/ci.sh configure", @@ -3634,13 +3630,12 @@ ], "variables": { "BIGNUM_BACKEND": "gmp", - "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate+fully_static", - "BROKEN_TESTS": "encoding004 T10458 ghcilink002 linker_unload_native", - "BUILD_FLAVOUR": "validate+fully_static", - "CONFIGURE_ARGS": "--disable-ld-override ", - "HADRIAN_ARGS": "--docs=no-sphinx", - "INSTALL_CONFIGURE_ARGS": "--disable-ld-override", - "TEST_ENV": "x86_64-linux-alpine3_12-validate+fully_static" + "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_17-wasm-cross_wasm32-wasi-release+fully_static", + "BUILD_FLAVOUR": "release+fully_static", + "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi", + "CROSS_TARGET": "wasm32-wasi", + "HADRIAN_ARGS": "--docs=none", + "TEST_ENV": "x86_64-linux-alpine3_17-wasm-cross_wasm32-wasi-release+fully_static" } }, "x86_64-linux-deb10-int_native-validate": { |