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.

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

Revert "Merge pull request #699 from rstudio/kg-quarto-update-1.4.550" #711

Merged
merged 1 commit into from
Mar 22, 2024
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Justfile
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ PYTHON_VERSION_ALT := "3.8.17"
PYTHON_VERSION_RHEL := "3.9.14"
PYTHON_VERSION_ALT_RHEL := "3.8.15"

QUARTO_VERSION := "1.4.550"
QUARTO_VERSION := "1.3.450"

# just _get-tag-safe-version 2022.07.2+576.pro12
_get-tag-safe-version $VERSION:
4 changes: 0 additions & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -9,10 +9,6 @@ This file only captures pervasive, repository-wide changes.

- Update Professional Drivers to 2024.03.0

# 2024-03-01

- BREAKING: Update Quarto version to 1.4.550

# 2024-02-01

- Update Pro Drivers to 2023.12.1
2 changes: 1 addition & 1 deletion ci.Justfile
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ PYTHON_VERSION_ALT := "3.8.17"
DRIVERS_VERSION := "2024.03.0"
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"

QUARTO_VERSION := "1.4.550"
QUARTO_VERSION := "1.3.340"

# just _get-os-alias jammy
_get-os-alias OS:
4 changes: 0 additions & 4 deletions connect/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# 2024-03-01

- BREAKING: Update Quarto version to 1.4.550

# 2023-08-01
- BREAKING: Removed R 3.6.2, replaced with R 4.1.3.
- Updated R 4.2.0 to 4.2.3.
2 changes: 1 addition & 1 deletion connect/rstudio-connect.gcfg
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ Executable = /opt/python/{{PYTHON_VERSION_ALT}}/bin/python

[Quarto]
Enabled = true
Executable = /opt/quarto/1.4.550/bin/quarto
Executable = /opt/quarto/1.3.340/bin/quarto

[RPackageRepository "CRAN"]
URL = https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
2 changes: 1 addition & 1 deletion content/base/Dockerfile.ubuntu2204
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ RUN curl -O https://cdn.rstudio.com/python/${DISTRIBUTION}/pkgs/python-${PYTHON_
&& /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --upgrade setuptools

# install quarto
ARG QUARTO_VERSION=1.4.550
ARG QUARTO_VERSION=1.3.340
COPY maybe_install_quarto.sh /tmp/maybe_install_quarto.sh
RUN /opt/R/${R_VERSION}/bin/R -e 'install.packages("odbc", repos="https://packagemanager.rstudio.com/cran/__linux__/bionic/latest")' \
&& /tmp/maybe_install_quarto.sh \
2 changes: 1 addition & 1 deletion content/base/Justfile
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ R_VERSION := "3.6.3"

PYTHON_VERSION := "3.9.5"

QUARTO_VERSION := "1.4.550"
QUARTO_VERSION := "1.3.340"

DEFAULT_TAG := IMAGE_PREFIX + PRODUCT + ":r" + R_VERSION + "-py" + PYTHON_VERSION + "-" + IMAGE_OS

4 changes: 0 additions & 4 deletions content/base/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# 2024-03-01

- BREAKING: Update Quarto version to 1.4.550

# 2023-04-26

- Use the Quarto release 1.3.340 in jammy images.
4 changes: 2 additions & 2 deletions content/base/maybe_install_quarto.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
# on bionic, only install quarto if python 3.10 and R 4.1
# TODO: figure out a different hierarchy...
if [[ `grep -oE bionic /etc/lsb-release` ]] && [[ `ls /opt/python/ | grep '3\.10\.'` ]] && [[ `ls /opt/R | grep '4\.1\.'` ]]; then
qver=${QUARTO_VERSION:-1.4.550}
qver=${QUARTO_VERSION:-1.3.340}
echo '--> Installing Quarto'
curl -L -o /quarto.deb https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.deb
apt install /quarto.deb
@@ -12,7 +12,7 @@ fi

# on jammy, always install quarto
if [[ `grep -oE jammy /etc/lsb-release` ]]; then
qver=${QUARTO_VERSION:-1.4.550}
qver=${QUARTO_VERSION:-1.3.340}
echo '--> Installing Quarto'
curl -L -o /quarto.tar.gz "https://github.com/quarto-dev/quarto-cli/releases/download/v${qver}/quarto-${qver}-linux-amd64.tar.gz"
mkdir -p /opt/quarto/${qver}
2 changes: 1 addition & 1 deletion product/base/Dockerfile.centos7
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ ARG R_VERSION_ALT=3.6.2
ARG PYTHON_VERSION=3.9.14
ARG PYTHON_VERSION_ALT=3.8.15
ARG TINI_VERSION=0.19.0
ARG QUARTO_VERSION=1.4.550
ARG QUARTO_VERSION=1.3.340

### Update/upgrade system packages ###
RUN yum upgrade -y -q \
2 changes: 1 addition & 1 deletion product/base/Dockerfile.ubuntu2204
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ ARG R_VERSION_ALT=4.1.3
ARG PYTHON_VERSION=3.9.17
ARG PYTHON_VERSION_ALT=3.8.17
ARG TINI_VERSION=0.19.0
ARG QUARTO_VERSION=1.4.550
ARG QUARTO_VERSION=1.3.340

### Update/upgrade system packages ###
RUN apt-get update --fix-missing \
2 changes: 1 addition & 1 deletion product/base/Justfile
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ PYTHON_VERSION := "3.9.17"
PYTHON_VERSION_ALT := "3.8.17"

TINI_VERSION := "0.19.0"
QUARTO_VERSION := "1.4.550"
QUARTO_VERSION := "1.3.340"

_make-default-tag OS=IMAGE_OS:
echo "{{IMAGE_REGISTRY}}/{{PRODUCT}}:{{OS}}-r{{R_VERSION}}_{{R_VERSION_ALT}}-py{{PYTHON_VERSION}}_{{PYTHON_VERSION_ALT}}"
2 changes: 1 addition & 1 deletion product/pro/Justfile
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ PYTHON_VERSION := "3.9.17"
PYTHON_VERSION_ALT := "3.8.17"

TINI_VERSION := "0.19.0"
QUARTO_VERSION := "1.4.550"
QUARTO_VERSION := "1.3.340"

DRIVERS_VERSION := "2024.03.0"
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
2 changes: 1 addition & 1 deletion workbench-for-google-cloud-workstations/.env
Original file line number Diff line number Diff line change
@@ -8,5 +8,5 @@ PYTHON_VERSION_JUPYTER=3.10.13
R_VERSION=4.2.3
R_VERSION_ALT=4.1.3
DRIVERS_VERSION=2023.05.0
QUARTO_VERSION=1.4.550
QUARTO_VERSION=1.3.340
IMAGE_REGISTRY_NAME=us-central1-docker.pkg.dev/posit-images/cloud-workstations/workbench
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ ARG PYTHON_VERSION=3.11.7
ARG PYTHON_VERSION_ALT=3.10.13
ARG PYTHON_VERSION_JUPYTER=3.10.13
ARG JUPYTERLAB_VERSION=3.6.5
ARG QUARTO_VERSION=1.4.550
ARG QUARTO_VERSION=1.3.450
ARG DRIVERS_VERSION=2023.05.0
ARG RSW_VERSION=2023.12.1+402.pro1
ARG RSW_NAME=rstudio-workbench