Skip to content
8 changes: 4 additions & 4 deletions ci/docker/linux-apt-docs.dockerfile
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 @@ -82,7 +81,8 @@ RUN pip install \
breathe==4.29.0 \
ipython \
sphinx \
pydata-sphinx-theme
pydata-sphinx-theme\
sphinx-tabs
Comment thread
thisisnic marked this conversation as 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
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
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
4 changes: 2 additions & 2 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1256,12 +1256,12 @@ tasks:
GO: 1.15
run: debian-go

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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test-ubuntu-default-docs already uses Ubuntu 20.04.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point! Given that this additional job was introduced in #10430 and things have moved on since then, I've removed the extra job. Or should I add it back in and pin it to a different version? It'd be good to know your thoughts too @jonkeane as you were the author of the PR I mentioned above and I don't fully understand everything that's going on there.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, I introduced test-ubuntu-default-docs because we started being unable to build docs on 20.04 (and that inability wasn't noticed cause we were only testing 20.10 before this)

It looks like the 20.10 build was changed from a much older one in #9933.

I'm not sure what the purpose of having a default build and then a separate build on a non-default version is. The one reason I can think of is that we want the non-default version to be a test of a new(ish) ubuntu version, to check for issues there. If that is the case (and we want to maintain that), we probably should build on 21.04 or 21.10. But I'm also totally fine removing the non-default docs build if it's more hassle than is helpful to maintain it.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, sounds like it made sense at the time but no longer serves a specific purpose, so unless there's any other reason to keep it in, let's leave it out for now (and add it back in if necessary later).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We chose Ubuntu 20.10 to reduce build time by using system gRPC: #9933 (review)

I'm OK with removing the docs job with non default UBUNTU version.

Could you also remove UBUNTU=20.10 from dev/release/post-09-docs.sh and ci/docker/ubuntu-20.10-cpp.dockerfile file?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha, thanks for clarifying that @kou! Just to check my understanding, did you mean remove the reference to 20.10 in dev/release/post-09-docs.sh but entirely remove the file ci/docker/ubuntu-20.10-cpp.dockerfile as no other tasks depend on this now?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

run: ubuntu-docs

test-ubuntu-default-docs:
Expand Down