revert quarto upgrade (#1840)

* revert quarto upgrade

* fix ruff
This commit is contained in:
Jack Gerrits 2024-03-02 14:45:28 -05:00 committed by GitHub
parent f2e42326e1
commit 2912f554a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 18 deletions

View File

@ -14,9 +14,9 @@ RUN apt-get update \
&& apt-get -y install --no-install-recommends build-essential npm \ && apt-get -y install --no-install-recommends build-essential npm \
&& apt-get autoremove -y \ && apt-get autoremove -y \
&& apt-get clean -y \ && apt-get clean -y \
&& wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-amd64.deb \ && wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.4.549/quarto-1.4.549-linux-amd64.deb \
&& dpkg -i quarto-1.5.23-linux-amd64.deb \ && dpkg -i quarto-1.4.549-linux-amd64.deb \
&& rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-amd64.deb && rm -rf /var/lib/apt/lists/* quarto-1.4.549-linux-amd64.deb
ENV DEBIAN_FRONTEND=dialog ENV DEBIAN_FRONTEND=dialog
# For docs # For docs

View File

@ -33,12 +33,12 @@ RUN cd website
RUN yarn install --frozen-lockfile --ignore-engines RUN yarn install --frozen-lockfile --ignore-engines
RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.tar.gz && \ wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.4.549/quarto-1.4.549-linux-${arch}.tar.gz && \
mkdir -p /home/autogen/quarto/ && \ mkdir -p /home/autogen/quarto/ && \
tar -xzf quarto-1.5.23-linux-${arch}.tar.gz --directory /home/autogen/quarto/ && \ tar -xzf quarto-1.4.549-linux-${arch}.tar.gz --directory /home/autogen/quarto/ && \
rm quarto-1.5.23-linux-${arch}.tar.gz rm quarto-1.4.549-linux-${arch}.tar.gz
ENV PATH="${PATH}:/home/autogen/quarto/quarto-1.5.23/bin/" ENV PATH="${PATH}:/home/autogen/quarto/quarto-1.4.549/bin/"
# Exposes the Yarn port for Docusaurus # Exposes the Yarn port for Docusaurus
EXPOSE 3000 EXPOSE 3000

View File

@ -44,9 +44,9 @@ jobs:
- name: quarto install - name: quarto install
working-directory: ${{ runner.temp }} working-directory: ${{ runner.temp }}
run: | run: |
wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-amd64.tar.gz wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.4.549/quarto-1.4.549-linux-amd64.tar.gz
tar -xzf quarto-1.5.23-linux-amd64.tar.gz tar -xzf quarto-1.4.549-linux-amd64.tar.gz
echo "$(pwd)/quarto-1.5.23/bin/" >> $GITHUB_PATH echo "$(pwd)/quarto-1.4.549/bin/" >> $GITHUB_PATH
- name: quarto run - name: quarto run
run: | run: |
quarto render . quarto render .
@ -90,9 +90,9 @@ jobs:
- name: quarto install - name: quarto install
working-directory: ${{ runner.temp }} working-directory: ${{ runner.temp }}
run: | run: |
wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-amd64.tar.gz wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.4.549/quarto-1.4.549-linux-amd64.tar.gz
tar -xzf quarto-1.5.23-linux-amd64.tar.gz tar -xzf quarto-1.4.549-linux-amd64.tar.gz
echo "$(pwd)/quarto-1.5.23/bin/" >> $GITHUB_PATH echo "$(pwd)/quarto-1.4.549/bin/" >> $GITHUB_PATH
- name: quarto run - name: quarto run
run: | run: |
quarto render . quarto render .

View File

@ -67,11 +67,11 @@ class Result:
def check_quarto_bin(quarto_bin: str = "quarto") -> None: def check_quarto_bin(quarto_bin: str = "quarto") -> None:
"""Check if quarto is installed.""" """Check if quarto is installed."""
try: try:
version = subprocess.check_output([quarto_bin, "--version"], text=True).strip() subprocess.check_output([quarto_bin, "--version"], text=True).strip()
version = tuple(map(int, version.split("."))) # version = tuple(map(int, version.split(".")))
if version < (1, 5, 23): # if version < (1, 5, 23):
print("Quarto version is too old. Please upgrade to 1.5.23 or later.") # print("Quarto version is too old. Please upgrade to 1.5.23 or later.")
sys.exit(1) # sys.exit(1)
except FileNotFoundError: except FileNotFoundError:
print("Quarto is not installed. Please install it from https://quarto.org") print("Quarto is not installed. Please install it from https://quarto.org")