Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARROW-14840: [R][CI] test-ubuntu-20.10-docs nightly build failing due to R install issue #11815

Closed
wants to merge 9 commits into from
Closed

ARROW-14840: [R][CI] test-ubuntu-20.10-docs nightly build failing due to R install issue #11815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8804c56
Update docs build to run in 21.04 and update to no longer use apt-key
thisisnic Nov 30, 2021
518cb8a
Change to 20.04 instead as having clang issues
thisisnic Nov 30, 2021
9ab33be
Add sphinx-tabs to doc dockerfile
thisisnic Nov 30, 2021
1cfdfcf
Alphabetise ordering
thisisnic Nov 30, 2021
e734997
Remove redundant job
thisisnic Nov 30, 2021
53e687c
alphabetise other list
thisisnic Nov 30, 2021
4092a64
Update ci/docker/linux-apt-docs.dockerfile
thisisnic Nov 30, 2021
69c79df
Remove redundant dockerfile and note to build ubuntu-docs on UBUNTU 2…
thisisnic Dec 1, 2021
a2134ee
Merge branch 'ARROW-14840' of github.com:thisisnic/arrow into ARROW-1…
thisisnic Dec 1, 2021
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
8 changes: 4 additions & 4 deletions ci/docker/linux-apt-docs.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ RUN apt-get update -y && \
dirmngr \
apt-transport-https \
software-properties-common && \
apt-key adv \
--keyserver keyserver.ubuntu.com \
--recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 && \
wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | \
tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc && \
add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu '$(lsb_release -cs)'-cran40/' && \
apt-get install -y --no-install-recommends \
autoconf-archive \
Expand Down Expand Up @@ -81,8 +80,9 @@ RUN pip install \
meson \
breathe==4.29.0 \
ipython \
pydata-sphinx-theme \
sphinx \
pydata-sphinx-theme
sphinx-tabs
thisisnic marked this conversation as resolved.
Show resolved Hide resolved

COPY c_glib/Gemfile /arrow/c_glib/
RUN gem install --no-document bundler && \
Expand Down
5 changes: 2 additions & 3 deletions ci/docker/linux-apt-lint.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@ RUN apt-get update && \
&& rm -rf /var/lib/apt/lists/*

ARG r=4.1
RUN apt-key adv \
--keyserver keyserver.ubuntu.com \
--recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 && \
RUN wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | \
tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc && \
# NOTE: R 3.5 and 3.6 are available in the repos with -cran35 suffix
# for trusty, xenial, bionic, and eoan (as of May 2020)
# -cran40 has 4.0 versions for bionic and focal
Expand Down
5 changes: 2 additions & 3 deletions ci/docker/linux-apt-r.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ RUN apt-get update -y && \
dirmngr \
apt-transport-https \
software-properties-common && \
apt-key adv \
--keyserver keyserver.ubuntu.com \
--recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 && \
wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | \
tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc && \
# NOTE: R 3.5 and 3.6 are available in the repos with -cran35 suffix
# for trusty, xenial, bionic, and eoan (as of May 2020)
# -cran40 has 4.0 versions for bionic and focal
Expand Down
140 changes: 0 additions & 140 deletions ci/docker/ubuntu-20.10-cpp.dockerfile
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion dev/release/post-09-docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ popd
pushd "${ARROW_DIR}"
git checkout "${release_tag}"

UBUNTU=20.10 archery docker run \
archery docker run \
-v "${ARROW_SITE_DIR}/docs:/build/docs" \
-e ARROW_DOCS_VERSION="${version}" \
ubuntu-docs
Expand Down
8 changes: 0 additions & 8 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,14 +1256,6 @@ tasks:
GO: 1.15
run: debian-go

test-ubuntu-20.10-docs:
ci: azure
template: docker-tests/azure.linux.yml
params:
env:
UBUNTU: "20.10"
run: ubuntu-docs

test-ubuntu-default-docs:
ci: azure
template: docker-tests/azure.linux.yml
Expand Down