diff options
| -rwxr-xr-x | .gitlab/gen_ci.hs | 8 | ||||
| -rw-r--r-- | .gitlab/jobs.yaml | 186 |
2 files changed, 3 insertions, 191 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index 386d085d8f..3bea08bd88 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -856,15 +856,13 @@ jobs = Map.fromList $ concatMap (filter is_enabled_job . flattenJobGroup) . setVariable "HADRIAN_ARGS" "--docs=none" . delVariable "INSTALL_CONFIGURE_ARGS" ) - $ StandardTriple - (validate Amd64 (Linux Alpine) cfg) - (nightly Amd64 (Linux Alpine) cfg) - (release Amd64 (Linux Alpine) cfg) + $ validateBuilds Amd64 (Linux Alpine) cfg wasm_build_config = (crossConfig "wasm32-wasi" NoEmulatorNeeded Nothing) - { buildFlavour = Release, + { fullyStatic = True + , buildFlavour = Release -- TODO: This needs to be validate but wasm backend doesn't pass yet } main :: IO () diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index fc064518b4..c6c943e971 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -2361,130 +2361,6 @@ "XZ_OPT": "-9" } }, - "release-x86_64-linux-alpine3_12-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": "1 year", - "paths": [ - "ghc-x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static.tar.xz", - "junit.xml" - ], - "reports": { - "junit": "junit.xml" - }, - "when": "always" - }, - "cache": { - "key": "x86_64-linux-alpine3_12-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] - }, - "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV", - "needs": [ - { - "artifacts": false, - "job": "hadrian-ghc-in-ghci" - } - ], - "rules": [ - { - "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")", - "when": "on_success" - } - ], - "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_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", - "IGNORE_PERF_FAILURES": "all", - "TEST_ENV": "x86_64-linux-alpine3_12-cross_wasm32-wasi-release+fully_static", - "XZ_OPT": "-9" - } - }, - "release-x86_64-linux-alpine3_12-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": "1 year", - "paths": [ - "ghc-x86_64-linux-alpine3_12-int_native-cross_wasm32-wasi-release+fully_static.tar.xz", - "junit.xml" - ], - "reports": { - "junit": "junit.xml" - }, - "when": "always" - }, - "cache": { - "key": "x86_64-linux-alpine3_12-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] - }, - "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV", - "needs": [ - { - "artifacts": false, - "job": "hadrian-ghc-in-ghci" - } - ], - "rules": [ - { - "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")", - "when": "on_success" - } - ], - "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_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", - "IGNORE_PERF_FAILURES": "all", - "TEST_ENV": "x86_64-linux-alpine3_12-int_native-cross_wasm32-wasi-release+fully_static", - "XZ_OPT": "-9" - } - }, "release-x86_64-linux-alpine3_12-int_native-release+fully_static": { "after_script": [ ".gitlab/ci.sh save_cache", @@ -2613,68 +2489,6 @@ "XZ_OPT": "-9" } }, - "release-x86_64-linux-alpine3_12-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": "1 year", - "paths": [ - "ghc-x86_64-linux-alpine3_12-unreg-cross_wasm32-wasi-release+fully_static.tar.xz", - "junit.xml" - ], - "reports": { - "junit": "junit.xml" - }, - "when": "always" - }, - "cache": { - "key": "x86_64-linux-alpine3_12-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] - }, - "dependencies": [], - "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV", - "needs": [ - { - "artifacts": false, - "job": "hadrian-ghc-in-ghci" - } - ], - "rules": [ - { - "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")", - "when": "on_success" - } - ], - "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_12-unreg-cross_wasm32-wasi-release+fully_static", - "BUILD_FLAVOUR": "release+fully_static", - "CONFIGURE_ARGS": "--disable-ld-override --enable-unregisterised --with-intree-gmp --with-system-libffi", - "CROSS_TARGET": "wasm32-wasi", - "HADRIAN_ARGS": "--docs=none", - "IGNORE_PERF_FAILURES": "all", - "TEST_ENV": "x86_64-linux-alpine3_12-unreg-cross_wasm32-wasi-release+fully_static", - "XZ_OPT": "-9" - } - }, "release-x86_64-linux-centos7-release+no_split_sections": { "after_script": [ ".gitlab/ci.sh save_cache", |