diff options
| author | Cheng Shao <terrorjack@type.dance> | 2023-03-27 17:07:10 +0000 |
|---|---|---|
| committer | Cheng Shao <terrorjack@type.dance> | 2023-03-30 18:42:56 +0000 |
| commit | cea56ccca154d477d858f3b25008df42b68a2b17 (patch) | |
| tree | 34960e68735b0cedd1eda3d56ec897af9d037176 /.gitlab/gen_ci.hs | |
| parent | 4a24dbbe2cb4ec5311af01321d1721e8964d0672 (diff) | |
| download | haskell-cea56ccca154d477d858f3b25008df42b68a2b17.tar.gz | |
ci: use alpine3_17-wasm image for wasm jobs
Bump the ci-images dependency and use the new alpine3_17-wasm docker
image for wasm jobs.
Diffstat (limited to '.gitlab/gen_ci.hs')
| -rwxr-xr-x | .gitlab/gen_ci.hs | 6 |
1 files changed, 3 insertions, 3 deletions
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) - |