Bug 1361413 - Docker image builder tasks fail due to missing locale-g…

…en (real fix) r=bustage --HG-- branch : NSS_TLS13_DRAFT19_BRANCH extra : source : 31d19659232df5a6a24c8c7c82da3411eb3efc16
sailfishos-mirror · May 3, 2017 · d70e76d · d70e76d
1 parent 7a18ea3
commit d70e76d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/automation/taskcluster/docker-aarch64/setup.sh b/automation/taskcluster/docker-aarch64/setup.sh
@@ -26,13 +26,13 @@ apt_packages+=('zlib1g-dev')
 apt_packages+=('ninja-build')
 apt_packages+=('gyp')
 apt_packages+=('mercurial')
+apt_packages+=('locales')
 
 # Install packages.
 apt-get install -y --no-install-recommends ${apt_packages[@]}
 
-# XXX Currently broken (bug 1361413).
-#locale-gen en_US.UTF-8
-#dpkg-reconfigure locales
+locale-gen en_US.UTF-8
+dpkg-reconfigure locales
 
 # Cleanup.
 rm -rf ~/.ccache ~/.cache

diff --git a/automation/taskcluster/docker-arm/setup.sh b/automation/taskcluster/docker-arm/setup.sh
@@ -12,6 +12,7 @@ apt_packages=()
 apt_packages+=('build-essential')
 apt_packages+=('ca-certificates')
 apt_packages+=('curl')
+apt_packages+=('locales')
 apt_packages+=('python-dev')
 apt_packages+=('python-pip')
 apt_packages+=('python-setuptools')
@@ -24,9 +25,8 @@ apt-get install -y --no-install-recommends ${apt_packages[@]}
 pip install --upgrade pip
 pip install Mercurial
 
-# XXX Currently broken (bug 1361413).
-#locale-gen en_US.UTF-8
-#dpkg-reconfigure locales
+locale-gen en_US.UTF-8
+dpkg-reconfigure locales
 
 # Cleanup.
 rm -rf ~/.ccache ~/.cache

diff --git a/automation/taskcluster/docker-clang-3.9/setup.sh b/automation/taskcluster/docker-clang-3.9/setup.sh
@@ -12,6 +12,7 @@ apt-get install -y --no-install-recommends apt-utils
 apt_packages=()
 apt_packages+=('ca-certificates')
 apt_packages+=('curl')
+apt_packages+=('locales')
 apt_packages+=('xz-utils')
 
 # Latest Mercurial.
@@ -34,9 +35,8 @@ tar xJvf *.tar.xz -C /usr/local --strip-components=1
 # Cleanup.
 rm *.tar.xz*
 
-# XXX Currently broken (bug 1361413).
-#locale-gen en_US.UTF-8
-#dpkg-reconfigure locales
+locale-gen en_US.UTF-8
+dpkg-reconfigure locales
 
 # Cleanup.
 rm -rf ~/.ccache ~/.cache

diff --git a/automation/taskcluster/docker-decision/setup.sh b/automation/taskcluster/docker-decision/setup.sh
@@ -7,7 +7,7 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get -y update && apt-get -y upgrade
 
 # Need those to install newer packages below.
-apt-get install -y --no-install-recommends apt-utils curl ca-certificates
+apt-get install -y --no-install-recommends apt-utils curl ca-certificates locales
 
 # Latest Mercurial.
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 41BD8711B1F0EC2B0D85B91CF59CE3A8323293EE

diff --git a/automation/taskcluster/docker-fuzz/setup.sh b/automation/taskcluster/docker-fuzz/setup.sh
@@ -17,6 +17,7 @@ apt_packages+=('git')
 apt_packages+=('gyp')
 apt_packages+=('libssl-dev')
 apt_packages+=('libxml2-utils')
+apt_packages+=('locales')
 apt_packages+=('ninja-build')
 apt_packages+=('pkg-config')
 apt_packages+=('zlib1g-dev')
@@ -37,9 +38,8 @@ git -C clang-tmp/clang checkout HEAD scripts/update.py
 clang-tmp/clang/scripts/update.py
 rm -fr clang-tmp
 
-# XXX Currently broken (bug 1361413).
-#locale-gen en_US.UTF-8
-#dpkg-reconfigure locales
+locale-gen en_US.UTF-8
+dpkg-reconfigure locales
 
 # Cleanup.
 rm -rf ~/.ccache ~/.cache

diff --git a/automation/taskcluster/docker/setup.sh b/automation/taskcluster/docker/setup.sh
@@ -17,6 +17,7 @@ apt_packages+=('npm')
 apt_packages+=('git')
 apt_packages+=('golang-1.6')
 apt_packages+=('libxml2-utils')
+apt_packages+=('locales')
 apt_packages+=('ninja-build')
 apt_packages+=('pkg-config')
 apt_packages+=('zlib1g-dev')
@@ -63,9 +64,8 @@ rm *.tar.xz*
 # Install latest Rust (stable).
 su worker -c "curl https://sh.rustup.rs -sSf | sh -s -- -y"
 
-# XXX Currently broken (bug 1361413).
-#locale-gen en_US.UTF-8
-#dpkg-reconfigure locales
+locale-gen en_US.UTF-8
+dpkg-reconfigure locales
 
 # Cleanup.
 rm -rf ~/.ccache ~/.cache