Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit d94e47c

Browse files
josephevansJoe Evansrondogencykpuatamazon
authored
[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 <joeev@amazon.com> Co-authored-by: Ziyi Mu <ziyi.mu@columbia.edu> Co-authored-by: kpuatamazon <56725192+kpuatamazon@users.noreply.github.com>
1 parent 2ad91d2 commit d94e47c

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

ci/docker/install/requirements

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,4 @@ pylint==2.3.1 # pylint and astroid need to be aligned
3131
astroid==2.3.3 # pylint and astroid need to be aligned
3232
requests<2.19.0,>=2.18.4
3333
scipy==1.2.1
34-
six==1.11.0
3534
setuptools<50

ci/docker/install/ubuntu_gcc8.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20-
sudo add-apt-repository ppa:jonathonf/gcc-8.0
21-
sudo add-apt-repository ppa:jonathonf/gcc-7.3
20+
sudo add-apt-repository ppa:jonathonf/gcc
2221
sudo apt-get update || true
2322
sudo apt-get install -y gcc-8 g++-8

ci/docker/install/ubuntu_r.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,13 @@ echo "deb http://cran.rstudio.com/bin/linux/ubuntu trusty/" >> /etc/apt/sources.
3131

3232
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9
3333

34+
add-apt-repository ppa:cran/libgit2
35+
3436
apt-get update || true
3537
apt-get install -y --allow-unauthenticated \
3638
libcairo2-dev \
39+
libgit2-dev \
40+
libssh2-1-dev \
3741
libssl-dev \
3842
libxml2-dev \
3943
libxt-dev \

0 commit comments

Comments
 (0)