From d94e47c8e37abebc0f92295c6cd2ad7e2def5898 Mon Sep 17 00:00:00 2001 From: Joe Evans Date: Fri, 11 Dec 2020 07:53:26 -0800 Subject: [PATCH] [v1.8.x] Backport #19656 - fix R builds (#19658) * Attempt to fix R builds. * Remove obsolete six dependency (#19620) * Change gcc 8 PPA to ppa:jonathonf/gcc (#19638) Co-authored-by: Joe Evans Co-authored-by: Ziyi Mu Co-authored-by: kpuatamazon <56725192+kpuatamazon@users.noreply.github.com> --- ci/docker/install/requirements | 1 - ci/docker/install/ubuntu_gcc8.sh | 3 +-- ci/docker/install/ubuntu_r.sh | 4 ++++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/docker/install/requirements b/ci/docker/install/requirements index be716dc5e788..a5ff7f507922 100644 --- a/ci/docker/install/requirements +++ b/ci/docker/install/requirements @@ -31,5 +31,4 @@ pylint==2.3.1 # pylint and astroid need to be aligned astroid==2.3.3 # pylint and astroid need to be aligned requests<2.19.0,>=2.18.4 scipy==1.2.1 -six==1.11.0 setuptools<50 diff --git a/ci/docker/install/ubuntu_gcc8.sh b/ci/docker/install/ubuntu_gcc8.sh index cd31f8213c1a..7488aaecd4ad 100755 --- a/ci/docker/install/ubuntu_gcc8.sh +++ b/ci/docker/install/ubuntu_gcc8.sh @@ -17,7 +17,6 @@ # specific language governing permissions and limitations # under the License. -sudo add-apt-repository ppa:jonathonf/gcc-8.0 -sudo add-apt-repository ppa:jonathonf/gcc-7.3 +sudo add-apt-repository ppa:jonathonf/gcc sudo apt-get update || true sudo apt-get install -y gcc-8 g++-8 diff --git a/ci/docker/install/ubuntu_r.sh b/ci/docker/install/ubuntu_r.sh index cd5fcb821d6f..6105da8c4813 100755 --- a/ci/docker/install/ubuntu_r.sh +++ b/ci/docker/install/ubuntu_r.sh @@ -31,9 +31,13 @@ echo "deb http://cran.rstudio.com/bin/linux/ubuntu trusty/" >> /etc/apt/sources. apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 +add-apt-repository ppa:cran/libgit2 + apt-get update || true apt-get install -y --allow-unauthenticated \ libcairo2-dev \ + libgit2-dev \ + libssh2-1-dev \ libssl-dev \ libxml2-dev \ libxt-dev \