Merge pull request #3594 from kinke/ubuntu2010

kinke · web-flow · commit 7b306c5ed148 · 2020-10-24T06:33:23.000+02:00
Cirrus CI: Adapt to Ubuntu rolling being 20.10 with LLVM 11 and gcc 10 now
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -131,14 +131,13 @@ task:
   timeout_in: 60m
   environment:
     CI_OS: linux
-    LIBCLANG_COMMON_VERSION: "10"
-    EXTRA_APT_PACKAGES: "gdmd locales"
+    LIBCLANG_COMMON_VERSION: "11"
+    EXTRA_APT_PACKAGES: "gdmd"
     EXTRA_CMAKE_FLAGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_LTO_LIBS=ON -DLDC_INSTALL_LTOPLUGIN=ON -DLDC_INSTALL_LLVM_RUNTIME_LIBS=ON -DD_COMPILER=gdmd -DLDC_LINK_MANUALLY=ON"
     PARALLELISM: 8
+    # for gdmd:
+    LANG: C.UTF-8
   << : *INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
-  setup_gdmd_script: |
-    locale-gen en_US.UTF-8
-    gdmd --version
   << : *COMMON_STEPS_TEMPLATE
 
 task:
diff --git a/runtime/druntime b/runtime/druntime
@@ -1 +1 @@
-Subproject commit 619795a630ab79dca02d29ecade0907ebc60ad76
+Subproject commit 4e4e61c8b993cedc612c2b184442aa908679a11e
