From 37b38c930579f8b8cace924e284136b7f1792c26 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Tue, 19 Nov 2024 15:21:50 -0300
Subject: [PATCH 1/2] CI: fix docs-ci issue

It got broke by af8b8d2c97c6ac7818784cfc81c1ee34742f19da but now for contributors.
---
 .circleci/config.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e9643be20e..aa5a7b6a2c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -769,9 +769,7 @@ jobs:
               cd meteor
               git fetch origin pull/$PR_NUMBER/head:$PR_BRANCH
             else
-              git clone https://github.com/meteor/meteor.git
-              cd meteor
-              git fetch origin pull/$CIRCLE_PR_NUMBER/head:pr-$CIRCLE_PR_NUMBER
+              git clone --branch $CIRCLE_BRANCH https://github.com/meteor/meteor.git ${CHECKOUT_METEOR_DOCS}
             fi
       # Run almost the same steps the meteor/docs repository runs, minus deploy.
       - run:

From 8760c53cef88915177ad5f165c4cafa2343c1272 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Tue, 19 Nov 2024 15:33:44 -0300
Subject: [PATCH 2/2] fix ci issue

---
 .circleci/config.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aa5a7b6a2c..b8fb12544f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -76,8 +76,8 @@ run_save_node_bin: &run_save_node_bin
     fi
 
 # This environment is set to every job (and the initial build).
-build_machine_environment: &build_machine_environment
-  # Specify that we want an actual machine (ala Circle 1.0), not a Docker image.
+build_machine_environment:
+  &build_machine_environment # Specify that we want an actual machine (ala Circle 1.0), not a Docker image.
   docker:
     - image: meteor/circleci:2024.09.11-android-34-node-20
   resource_class: large
@@ -104,8 +104,8 @@ build_machine_environment: &build_machine_environment
 
     # These will be evaled before each command.
     PRE_TEST_COMMANDS: |-
-        ulimit -c unlimited; # Set core dump size as Ubuntu 14.04 lacks prlimit.
-        ulimit -a # Display all ulimit settings for transparency.
+      ulimit -c unlimited; # Set core dump size as Ubuntu 14.04 lacks prlimit.
+      ulimit -a # Display all ulimit settings for transparency.
 
     # This is only to make Meteor self-test not remind us that we can set
     # this argument for self-tests.
@@ -765,8 +765,8 @@ jobs:
             if [[ -n "$CIRCLE_PULL_REQUEST" ]]; then
               PR_NUMBER=$(echo $CIRCLE_PULL_REQUEST | sed 's|.*/pull/\([0-9]*\)|\1|')
               PR_BRANCH=$(curl -s https://api.github.com/repos/meteor/meteor/pulls/$PR_NUMBER | jq -r .head.ref)
-              git clone https://github.com/meteor/meteor.git
-              cd meteor
+              git clone https://github.com/meteor/meteor.git ${CHECKOUT_METEOR_DOCS}
+              cd ${CHECKOUT_METEOR_DOCS}
               git fetch origin pull/$PR_NUMBER/head:$PR_BRANCH
             else
               git clone --branch $CIRCLE_BRANCH https://github.com/meteor/meteor.git ${CHECKOUT_METEOR_DOCS}
@@ -775,7 +775,7 @@ jobs:
       - run:
           name: Generating Meteor documentation for JSDoc testing
           command: |
-            cd meteor/docs
+            cd ${CHECKOUT_METEOR_DOCS}/docs
             npm install
             npm test