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

[v1.8.x] Backport #19656 - fix R builds #19658

Merged
merged 3 commits into from
Dec 11, 2020
Merged

[v1.8.x] Backport #19656 - fix R builds #19658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3947455
Attempt to fix R builds.
Dec 11, 2020
9a7c3f0
Remove obsolete six dependency (#19620)
rondogency Dec 3, 2020
abfc34a
Change gcc 8 PPA to ppa:jonathonf/gcc (#19638)
kpuatamazon Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ci/docker/install/requirements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions ci/docker/install/ubuntu_gcc8.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions ci/docker/install/ubuntu_r.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down