diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2022-11-04 17:41:34 +0100 |
|---|---|---|
| committer | Sylvain Henry <sylvain@haskus.fr> | 2022-11-07 12:00:41 +0100 |
| commit | aa2cab6adc97df21ca26ceb2d33cd8b5b3d308bd (patch) | |
| tree | 23264552366ba12285520a652b03a4ae2427450d | |
| parent | 12a76e06b8bf430a3cee1ec010110e3dad4ea1c9 (diff) | |
| download | haskell-aa2cab6adc97df21ca26ceb2d33cd8b5b3d308bd.tar.gz | |
Remove PerfJS mention in ci script
| -rwxr-xr-x | .gitlab/gen_ci.hs | 5 | ||||
| -rw-r--r-- | .gitlab/jobs.yaml | 20 |
2 files changed, 12 insertions, 13 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index f1d21be221..b31f4a2c8b 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -147,7 +147,7 @@ data Flavour = Flavour BaseFlavour [FlavourTrans] data FlavourTrans = Llvm | Dwarf | FullyStatic | ThreadSanitiser -data BaseFlavour = Release | Validate | SlowValidate | PerfJS +data BaseFlavour = Release | Validate | SlowValidate ----------------------------------------------------------------------------- -- Build Configs @@ -282,7 +282,6 @@ flavourString (Flavour base trans) = baseString base ++ concatMap (("+" ++) . fl baseString Release = "release" baseString Validate = "validate" baseString SlowValidate = "slow-validate" - baseString PerfJS = "perf-js" flavourString Llvm = "llvm" flavourString Dwarf = "debug_info" @@ -823,7 +822,7 @@ jobs = Map.fromList $ concatMap flattenJobGroup $ , validateBuilds Amd64 (Linux Debian11) (crossConfig "js-unknown-ghcjs" Nothing (Just "emconfigure") ) { bignumBackend = Native - , buildFlavour = PerfJS + , buildFlavour = Release } ] diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index a794a8f774..0c458fa86e 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -1328,7 +1328,7 @@ "XZ_OPT": "-9" } }, - "nightly-x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-perf-js": { + "nightly-x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-release": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh clean", @@ -1338,7 +1338,7 @@ "artifacts": { "expire_in": "8 weeks", "paths": [ - "ghc-x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-perf-js.tar.xz", + "ghc-x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-release.tar.xz", "junit.xml" ], "reports": { @@ -1380,12 +1380,12 @@ ], "variables": { "BIGNUM_BACKEND": "native", - "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-perf-js", - "BUILD_FLAVOUR": "perf-js", + "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-release", + "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--with-intree-gmp", "CONFIGURE_WRAPPER": "emconfigure", "CROSS_TARGET": "js-unknown-ghcjs", - "TEST_ENV": "x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-perf-js", + "TEST_ENV": "x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-release", "XZ_OPT": "-9" } }, @@ -3871,7 +3871,7 @@ "TEST_ENV": "x86_64-linux-deb11-cross_aarch64-linux-gnu-validate" } }, - "x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-perf-js": { + "x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-release": { "after_script": [ ".gitlab/ci.sh save_cache", ".gitlab/ci.sh clean", @@ -3881,7 +3881,7 @@ "artifacts": { "expire_in": "2 weeks", "paths": [ - "ghc-x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-perf-js.tar.xz", + "ghc-x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-release.tar.xz", "junit.xml" ], "reports": { @@ -3923,12 +3923,12 @@ ], "variables": { "BIGNUM_BACKEND": "native", - "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-perf-js", - "BUILD_FLAVOUR": "perf-js", + "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-release", + "BUILD_FLAVOUR": "release", "CONFIGURE_ARGS": "--with-intree-gmp", "CONFIGURE_WRAPPER": "emconfigure", "CROSS_TARGET": "js-unknown-ghcjs", - "TEST_ENV": "x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-perf-js" + "TEST_ENV": "x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-release" } }, "x86_64-linux-deb11-validate": { |