diff options
author | Cheng Shao <terrorjack@type.dance> | 2023-04-01 17:07:29 +0000 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-04-27 16:00:35 -0400 |
commit | 533d075e722c020b690e81dad61168697c3eee84 (patch) | |
tree | 79ac94904c2f8793c98893309bde5e6567a2447e | |
parent | d5c4629b64cd30c5b443db3124f3b02283d122ca (diff) | |
download | haskell-533d075e722c020b690e81dad61168697c3eee84.tar.gz |
ci: additional wasm32 manual jobs in validate pipelines
This patch enables bignum native & unregisterised wasm32 jobs as
manual jobs in validate pipelines, which can be useful to prevent
breakage when working on wasm32 related patches.
-rwxr-xr-x | .gitlab/gen_ci.hs | 6 | ||||
-rw-r--r-- | .gitlab/jobs.yaml | 122 |
2 files changed, 126 insertions, 2 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index 456d7f2257..5badde02d5 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -908,8 +908,10 @@ job_groups = { bignumBackend = Native } , make_wasm_jobs wasm_build_config - , disableValidate $ make_wasm_jobs wasm_build_config { bignumBackend = Native } - , disableValidate $ make_wasm_jobs wasm_build_config { unregisterised = True } + , modifyValidateJobs manual $ + make_wasm_jobs wasm_build_config {bignumBackend = Native} + , modifyValidateJobs manual $ + make_wasm_jobs wasm_build_config {unregisterised = True} , addValidateRule NonmovingGc (standardBuildsWithConfig Amd64 (Linux Debian11) vanilla {validateNonmovingGc = True}) ] diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index d1a70dfe4d..26ab071d71 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -3638,6 +3638,128 @@ "TEST_ENV": "x86_64-linux-alpine3_17-wasm-cross_wasm32-wasi-release+fully_static" } }, + "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", + "cat ci_timings" + ], + "allow_failure": false, + "artifacts": { + "expire_in": "2 weeks", + "paths": [ + "ghc-x86_64-linux-alpine3_17-wasm-int_native-cross_wasm32-wasi-release+fully_static.tar.xz", + "junit.xml" + ], + "reports": { + "junit": "junit.xml" + }, + "when": "always" + }, + "cache": { + "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_17-wasm:$DOCKER_REV", + "needs": [ + { + "artifacts": false, + "job": "hadrian-ghc-in-ghci" + } + ], + "rules": [ + { + "allow_failure": true, + "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")", + "when": "manual" + } + ], + "script": [ + "sudo chown ghc:ghc -R .", + ".gitlab/ci.sh setup", + ".gitlab/ci.sh configure", + ".gitlab/ci.sh build_hadrian", + ".gitlab/ci.sh test_hadrian" + ], + "stage": "full-build", + "tags": [ + "x86_64-linux" + ], + "variables": { + "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": "--with-intree-gmp --with-system-libffi", + "CROSS_TARGET": "wasm32-wasi", + "HADRIAN_ARGS": "--docs=none", + "TEST_ENV": "x86_64-linux-alpine3_17-wasm-int_native-cross_wasm32-wasi-release+fully_static" + } + }, + "x86_64-linux-alpine3_17-wasm-unreg-cross_wasm32-wasi-release+fully_static": { + "after_script": [ + ".gitlab/ci.sh save_cache", + ".gitlab/ci.sh clean", + "cat ci_timings" + ], + "allow_failure": false, + "artifacts": { + "expire_in": "2 weeks", + "paths": [ + "ghc-x86_64-linux-alpine3_17-wasm-unreg-cross_wasm32-wasi-release+fully_static.tar.xz", + "junit.xml" + ], + "reports": { + "junit": "junit.xml" + }, + "when": "always" + }, + "cache": { + "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_17-wasm:$DOCKER_REV", + "needs": [ + { + "artifacts": false, + "job": "hadrian-ghc-in-ghci" + } + ], + "rules": [ + { + "allow_failure": true, + "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")", + "when": "manual" + } + ], + "script": [ + "sudo chown ghc:ghc -R .", + ".gitlab/ci.sh setup", + ".gitlab/ci.sh configure", + ".gitlab/ci.sh build_hadrian", + ".gitlab/ci.sh test_hadrian" + ], + "stage": "full-build", + "tags": [ + "x86_64-linux" + ], + "variables": { + "BIGNUM_BACKEND": "gmp", + "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" + } + }, "x86_64-linux-deb10-int_native-validate": { "after_script": [ ".gitlab/ci.sh save_cache", |