From 2158274991df883a7cf2ac3e89f8f7e7755a03a2 Mon Sep 17 00:00:00 2001 From: Matt Meigs Date: Mon, 6 May 2024 15:08:39 -0400 Subject: [PATCH 1/8] change frontend snooty to branch --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 65be09e59..5a9565242 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,7 @@ ENV PATH="${WORK_DIRECTORY}/.cargo/bin:${PATH}" RUN curl https://raw.githubusercontent.com/mongodb/docs-worker-pool/meta/makefiles/shared.mk -o shared.mk # install snooty frontend and docs-tools -RUN git clone -b v${SNOOTY_FRONTEND_VERSION} --depth 1 https://github.com/mongodb/snooty.git \ +RUN git clone -b DOP-4594-slug-breadcrumblabel --depth 1 https://github.com/mongodb/snooty.git \ && cd snooty \ # Need to remove omit dev as the filter functionality for the frontend depends on a dev dependency. && npm ci --legacy-peer-deps \ From 34dbd0f44b33187cd3832f94640557a577c470d2 Mon Sep 17 00:00:00 2001 From: Matt Meigs Date: Wed, 8 May 2024 09:28:45 -0400 Subject: [PATCH 2/8] change snooty v --- .github/workflows/deploy-stg-ecs.yml | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-stg-ecs.yml b/.github/workflows/deploy-stg-ecs.yml index 2e0cfb462..e929c5f16 100644 --- a/.github/workflows/deploy-stg-ecs.yml +++ b/.github/workflows/deploy-stg-ecs.yml @@ -3,6 +3,7 @@ on: branches: - "main" - "integration" + - "mm-look-at-toc" concurrency: group: environment-stg-${{ github.ref }} cancel-in-progress: true diff --git a/Dockerfile b/Dockerfile index 5a9565242..1a116801d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,7 @@ ENV PATH="${WORK_DIRECTORY}/.cargo/bin:${PATH}" RUN curl https://raw.githubusercontent.com/mongodb/docs-worker-pool/meta/makefiles/shared.mk -o shared.mk # install snooty frontend and docs-tools -RUN git clone -b DOP-4594-slug-breadcrumblabel --depth 1 https://github.com/mongodb/snooty.git \ +RUN git clone -b fix-breadcrumb-links --depth 1 https://github.com/mongodb/snooty.git \ && cd snooty \ # Need to remove omit dev as the filter functionality for the frontend depends on a dev dependency. && npm ci --legacy-peer-deps \ From 64aea84c933ca27f50b73010cbc09803517c6764 Mon Sep 17 00:00:00 2001 From: Matt Meigs Date: Wed, 8 May 2024 10:38:34 -0400 Subject: [PATCH 3/8] new snooty From 5a204967cc1aca046881070621c1d191048049c7 Mon Sep 17 00:00:00 2001 From: Matt Meigs Date: Wed, 8 May 2024 12:10:58 -0400 Subject: [PATCH 4/8] newer snooty From a8bad8a71c349a7f1417bd3ce8621898f0f13407 Mon Sep 17 00:00:00 2001 From: Matt Meigs Date: Thu, 9 May 2024 09:33:43 -0400 Subject: [PATCH 5/8] change snooty and parser --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a116801d..96c3ac2b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN cd ./modules/oas-page-builder \ # where repo work will happen FROM ubuntu:20.04 ARG WORK_DIRECTORY=/home/docsworker-xlarge -ARG SNOOTY_PARSER_VERSION=0.16.6 +ARG SNOOTY_PARSER_VERSION=0.16.7-beta ARG SNOOTY_FRONTEND_VERSION=0.16.13 ARG MUT_VERSION=0.11.2 ARG REDOC_CLI_VERSION=1.2.3 @@ -75,7 +75,7 @@ ENV PATH="${WORK_DIRECTORY}/.cargo/bin:${PATH}" RUN curl https://raw.githubusercontent.com/mongodb/docs-worker-pool/meta/makefiles/shared.mk -o shared.mk # install snooty frontend and docs-tools -RUN git clone -b fix-breadcrumb-links --depth 1 https://github.com/mongodb/snooty.git \ +RUN git clone -b DOP-4594-slug-breadcrumblabel --depth 1 https://github.com/mongodb/snooty.git \ && cd snooty \ # Need to remove omit dev as the filter functionality for the frontend depends on a dev dependency. && npm ci --legacy-peer-deps \ From 738859e55b8ea6a3a32678d5109123c01686a1fb Mon Sep 17 00:00:00 2001 From: Matt Meigs Date: Thu, 9 May 2024 09:43:50 -0400 Subject: [PATCH 6/8] odd name for parser --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 96c3ac2b6..05e5e13a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ RUN apt-get install --yes build-essential RUN npm install -g npm@8 # install snooty parser -RUN curl -L -o snooty-parser.zip https://github.com/mongodb/snooty-parser/releases/download/v${SNOOTY_PARSER_VERSION}/snooty-v${SNOOTY_PARSER_VERSION}-linux_x86_64.zip \ +RUN curl -L -o snooty-parser.zip https://github.com/mongodb/snooty-parser/releases/download/untagged-b592d959b3c7570fd95a/snooty-v0.16.7-beta-linux_x86_64.zip \ && unzip -d /opt/ snooty-parser.zip # install mut From 0d1645f19026e4d850e3d83fed503f5ae8d1cda8 Mon Sep 17 00:00:00 2001 From: Matt Meigs Date: Thu, 9 May 2024 09:51:13 -0400 Subject: [PATCH 7/8] undrafted release --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 05e5e13a8..1e1cf4ea0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN cd ./modules/oas-page-builder \ # where repo work will happen FROM ubuntu:20.04 ARG WORK_DIRECTORY=/home/docsworker-xlarge -ARG SNOOTY_PARSER_VERSION=0.16.7-beta +ARG SNOOTY_PARSER_VERSION=0.16.7-b ARG SNOOTY_FRONTEND_VERSION=0.16.13 ARG MUT_VERSION=0.11.2 ARG REDOC_CLI_VERSION=1.2.3 @@ -48,7 +48,7 @@ RUN apt-get install --yes build-essential RUN npm install -g npm@8 # install snooty parser -RUN curl -L -o snooty-parser.zip https://github.com/mongodb/snooty-parser/releases/download/untagged-b592d959b3c7570fd95a/snooty-v0.16.7-beta-linux_x86_64.zip \ +RUN curl -L -o snooty-parser.zip https://github.com/mongodb/snooty-parser/releases/download/v${SNOOTY_PARSER_VERSION}/snooty-v${SNOOTY_PARSER_VERSION}-linux_x86_64.zip \ && unzip -d /opt/ snooty-parser.zip # install mut @@ -75,7 +75,7 @@ ENV PATH="${WORK_DIRECTORY}/.cargo/bin:${PATH}" RUN curl https://raw.githubusercontent.com/mongodb/docs-worker-pool/meta/makefiles/shared.mk -o shared.mk # install snooty frontend and docs-tools -RUN git clone -b DOP-4594-slug-breadcrumblabel --depth 1 https://github.com/mongodb/snooty.git \ +RUN git clone -b fix-breadcrumb-links --depth 1 https://github.com/mongodb/snooty.git \ && cd snooty \ # Need to remove omit dev as the filter functionality for the frontend depends on a dev dependency. && npm ci --legacy-peer-deps \ From c36864e2d3d36814a82ea0644772491133a10c6b Mon Sep 17 00:00:00 2001 From: Matt Meigs Date: Thu, 9 May 2024 10:32:23 -0400 Subject: [PATCH 8/8] use slug snooty --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1e1cf4ea0..745f4678d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,7 @@ ENV PATH="${WORK_DIRECTORY}/.cargo/bin:${PATH}" RUN curl https://raw.githubusercontent.com/mongodb/docs-worker-pool/meta/makefiles/shared.mk -o shared.mk # install snooty frontend and docs-tools -RUN git clone -b fix-breadcrumb-links --depth 1 https://github.com/mongodb/snooty.git \ +RUN git clone -b DOP-4594-slug-breadcrumblabel --depth 1 https://github.com/mongodb/snooty.git \ && cd snooty \ # Need to remove omit dev as the filter functionality for the frontend depends on a dev dependency. && npm ci --legacy-peer-deps \