Merge branch 'main' into marcospereira/experiment/merge/server-4.7

* main: (123 commits)
  updates to vale config
  move example
  formatting fixes
  Add error documentation for job retention configuration
  Change wording in cache retention.
  revert fix and remove line numbering for code blocks
  remove workflow.job.approve from list
  update copy and images for deploys overview and rollbacks
  collect code content without line numbers and connect together with single line breaks
  Add job retention documentation with config.yml example
  prevent filefox flexbox from becoming too narrow
  Replace all aloglia objects, instead of just adding (#9513)
  Document organization deletion feature (#9475)
  Add page explaining using both GitHub integrations together (#9504)
  Add documentation for the Xcode 26 Beta 5 image (#9499)
  Archive Sagemaker integration docs (#9505)
  chore(deps): update module github.com/golangci/golangci-lint/v2 to v2.4.0 (#9497)
  fix(deps): update aws-sdk-go-v2 monorepo (#9494)
  chore(deps): update cimg/go docker tag to v1.25 (#9492)
  chore(deps): update dependency stylelint-config-standard to v39 (#9477)
  ...

Author: marcospereira-circleci

.circleci/config.yml

@@ -1,23 +1,24 @@
 version: 2.1
 
-parameters:
-  cleanup_preview_branch:
-    type: string
-    default: ""
-
 orbs:
   aws-cli: circleci/[email protected]
   vale: circleci/[email protected]
+  go: circleci/[email protected]
 
 executors:
   node_executor:
     docker:
-      - image: cimg/node:22.15.1
+      - image: cimg/node:22.18.0
+    working_directory: ~/project
+
+  go_executor:
+    docker:
+      - image: cimg/go:1.25
     working_directory: ~/project
 
   ruby_executor:
     docker:
-      - image: cimg/ruby:3.4
+      - image: cimg/ruby:3.4.5
     working_directory: ~/project
 
 commands:
@@ -28,25 +29,6 @@ commands:
           aws_secret_access_key: ${AWS_SECRET_ACCESS_KEY}
           region: ${AWS_REGION}
 
-  sanitize-branch:
-    steps:
-      - run:
-          name: Sanitize Branch Name
-          command: |
-            if [ -n "<< pipeline.parameters.cleanup_preview_branch >>" ]; then
-              BRANCH_TO_USE="<< pipeline.parameters.cleanup_preview_branch >>"
-              echo "[INFO] Using provided branch param: ${BRANCH_TO_USE}"
-            else
-              BRANCH_TO_USE="${CIRCLE_BRANCH}"
-              echo "[INFO] Using current branch: ${BRANCH_TO_USE}"
-            fi
-
-            # Replace forward-slashes and spaces with double underscore
-            SANITIZED_BRANCH=$(echo "${BRANCH_TO_USE}" | tr '/ ' '__')
-            echo "[INFO] Sanitized branch: ${SANITIZED_BRANCH}"
-            echo "export SANITIZED_BRANCH=${SANITIZED_BRANCH}" >> $BASH_ENV
-            source $BASH_ENV
-
   notify_error:
     parameters:
       message:
@@ -77,31 +59,16 @@ jobs:
             - "SHA256:Plac654CPBty6yA26H7QMKCqM0yD1XWds7UwNqOYzJU"
       - run:
           name: Install Node Dependencies
-          command: |
-            set -e
-            echo "[INFO] Installing Node dependencies..."
-            npm ci
+          command: npm ci
       - run:
           name: Build the Documentation Site with Antora
           command: |
             set -e
             echo "[INFO] Starting Antora build..."
             npm run build:docs
             echo "[INFO] Antora build completed."
-      - run:
-          name: Create ZIP Archive of Build
-          command: |
-            set -e
-            echo "[INFO] Creating zip archive of build directory..."
-            zip -r build.zip build/
       - store_artifacts:
-          path: build.zip
-          destination: preview-site.zip
-      - persist_to_workspace:
-          root: .
-          paths:
-            - build
-            - build.zip
+          path: build
       - persist_to_workspace:
           root: .
           paths:
@@ -110,190 +77,64 @@ jobs:
           message: "Build job failed for branch ${CIRCLE_BRANCH}"
 
   validate:
-    executor: ruby_executor
+    executor: go_executor
     steps:
+      - checkout
       - attach_workspace:
           at: .
-      - run:
-          name: Install HTML Proofer
-          command: |
-            set -e
-            echo "[INFO] Installing HTML Proofer gem..."
-            sudo gem install html-proofer
-      - run:
-          name: Run HTML Proofer Validation
-          command: |
-            set -e
-            echo "[INFO] Validating built site with HTML Proofer..."
-            htmlproofer ./build --checks html --ignore-urls "/#.*/" --ignore-empty-alt
+      - go/with-cache:
+          golangci-lint: true
+          steps:
+            - run: task mod-download
+            - run: task ci:diff
+            - run: task ci:lint
+            - run: task validate-html
       - notify_error:
           message: "Validation job failed for branch ${CIRCLE_BRANCH}"
 
-  deploy-preview:
-    executor: node_executor
-    steps:
-      - attach_workspace:
-          at: .
-      - sanitize-branch
-      - run:
-          name: Install GitHub CLI
-          command: |
-            set -e
-            echo "[INFO] Installing GitHub CLI..."
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt update
-            sudo apt install gh
-      - run:
-          name: Upload Preview ZIP to GitHub Release and Comment
-          command: |
-            set -e
-
-            if [[ -n "${CIRCLE_PULL_REQUEST}" ]]; then
-              PR_NUMBER=$(echo "$CIRCLE_PULL_REQUEST" | sed 's|.*/pull/||')
-              REPO_PATH="circleci/circleci-docs-static"
-              TAG="pr-${SANITIZED_BRANCH}"
-
-              echo "[INFO] Creating release for PR #${PR_NUMBER} - branch ${SANITIZED_BRANCH} in ${REPO_PATH}"
-
-              # Check if release already exists (if re-run)
-              if gh release view "${TAG}" -R "${REPO_PATH}" > /dev/null 2>&1; then
-                echo "[INFO] Release already exists. Replacing..."
-                gh release delete "${TAG}" -R "${REPO_PATH}" --yes
-              fi
-
-              # Create new release and upload ZIP
-              gh release create "${TAG}" build.zip \
-                --repo "${REPO_PATH}" \
-                --title "Preview for PR #${PR_NUMBER}" \
-                --notes "ZIP artifact for documentation preview." \
-                --prerelease
-
-              DOWNLOAD_URL="https://github.com/${REPO_PATH}/releases/tag/${TAG}/build.zip"
-
-              # Comment on the PR with release link
-              gh pr comment "${PR_NUMBER}" -R "${REPO_PATH}" -b "## Preview Documentation
-
-              📦 ZIP preview available here: [Preview Build Assets](${DOWNLOAD_URL})
-
-              Build: ${CIRCLE_BUILD_NUM} | Commit: ${CIRCLE_SHA1}"
-            else
-              echo "[INFO] Not a PR build, skipping preview release."
-            fi
-      - notify_error:
-          message: "Deploy preview job failed for branch ${CIRCLE_BRANCH}"
-
   deploy-production:
-    executor: node_executor
-    parameters:
-      bucket_name:
-        description: The name of the s3 bucket where static assets are stored.
-        type: string
-      build_dir:
-        default: "build"
-        description: The path to the docs build directory
-        type: string
+    executor: go_executor
     steps:
+      - checkout
       - attach_workspace:
           at: .
       - aws-setup
-      - run:
-          name: Deploy Production Site to S3
-          command: |
-            AWS_S3_BUCKET=<< parameters.bucket_name >>
-            BUILD_DIRECTORY=<< parameters.build_dir >>
-
-            set -e
-            echo "[INFO] Deploying production site..."
-            aws s3 sync "$BUILD_DIRECTORY" "s3://$AWS_S3_BUCKET/"
+      - go/with-cache:
+          steps:
+            - run: task mod-download
+            - run: task deploy
+            - run: task deploy-redirects
+            - run: task validate-redirects
       - notify_error:
           message: "Production deployment job failed for branch ${CIRCLE_BRANCH}"
 
-  cleanup-preview:
-    executor: node_executor
-    steps:
-      - sanitize-branch
-      - run:
-          name: Install GitHub CLI
-          command: |
-            set -e
-            echo "[INFO] Installing GitHub CLI..."
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt update
-            sudo apt install gh
-      - run:
-          name: Delete GitHub Release and Tag
-          command: |
-            set -e
-            BRANCH="<< pipeline.parameters.cleanup_preview_branch >>"
-            REPO_PATH="circleci/circleci-docs-static"
-
-            # Extract TAG
-            TAG="pr-${SANITIZED_BRANCH}"
-
-            echo "[INFO] Cleaning up GitHub Release for ${TAG} in ${REPO_PATH}"
-
-            # Delete the release if it exists
-            if gh release view "${TAG}" -R "${REPO_PATH}" > /dev/null 2>&1; then
-              gh release delete "${TAG}" -R "${REPO_PATH}" --yes
-              echo "[INFO] Release '${TAG}' deleted."
-            else
-              echo "[WARN] Release '${TAG}' not found."
-            fi
-
-            # Delete the tag if it exists
-            if gh api -X GET "repos/${REPO_PATH}/git/refs/tags/${TAG}" > /dev/null 2>&1; then
-              gh tag delete "${TAG}" -R "${REPO_PATH}" --yes
-              echo "[INFO] Tag '${TAG}' deleted."
-            else
-              echo "[WARN] Tag '${TAG}' not found."
-            fi
-
 workflows:
-  lint:
-    unless:
-      equal: [main, << pipeline.git.branch >>]
+  main:
     jobs:
       - vale/lint:
           reference_branch: main
           base_dir: docs
-  build_validate_and_deploy:
-    when:
-      equal: ["", << pipeline.parameters.cleanup_preview_branch >>]
-    jobs:
+          filters: pipeline.git.branch != "main"
+
       - build:
-          context: circleci-docs-static
-      - validate:
-          requires: [build]
-      - deploy-preview:
-          requires: [validate]
-          filters:
-            branches:
-              ignore: main
+          filters: pipeline.git.branch == "main"
+          name: build-main
           context:
-            [
-              circleci-docs-static,
-              docs-platform-assets,
-              web-ui-npm,
-              web-ui-datadog,
-            ]
+            - circleci-docs-static
+      - build:
+          filters: pipeline.git.branch != "main"
+
+      - validate:
+          requires:
+            - build-main
+            - build
+
       - deploy-production:
-          requires: [validate]
-          filters:
-            branches:
-              only: main
+          requires:
+            - validate
+          filters: pipeline.git.branch == "main"
           context:
-            [
-              circleci-docs-static,
-              docs-platform-assets,
-              web-ui-npm,
-              web-ui-datadog,
-            ]
-          bucket_name: "circleci-docs-platform-assets/docs-preview"
-          build_dir: "build"
-  cleanup_preview:
-    when: pipeline.parameters.cleanup_preview_branch != ""
-    jobs:
-      - cleanup-preview:
-          context: circleci-docs-static
+            - circleci-docs-static
+            - docs-platform-assets
+            - web-ui-npm
+            - web-ui-datadog

.gitignore

@@ -1,11 +1,13 @@
-node_modules/
-build/
+/node_modules/
+/build/
 **/.DS_Store
-ui-bundle.zip
-ui/build/
-ui/node_modules/
-ui/public/
-ui/**/.DS_Store
-extensions/.temp
-.env
-.vscode/
+/ui-bundle.zip
+/ui/build/
+/ui/node_modules/
+/ui/public/
+/ui/**/.DS_Store
+/extensions/.temp
+/.env
+/.vscode/
+/.htmltest
+/test-reports

.htmltest.yml

@@ -0,0 +1,15 @@
+DirectoryPath: "build"
+CheckExternal: false
+EnforceHTTPS: true
+CheckSelfReferencesAsInternal: true
+BaseURL: https://circleci.com/docs
+IgnoreAltEmpty: true
+IgnoreInternalEmptyHash: true
+IgnoreURLs:
+  - "[url]"
+  - "[path]"
+  - "/docs/"
+  - "/docs/_/img/x-icon.svg"
+IgnoreDirs:
+  - "api"
+OutputDir: ".htmltest"

.nvmrc

@@ -0,0 +1 @@
+v22.18.0

CONTRIBUTING.md

@@ -44,18 +44,18 @@ There are several ways to contribute to the CircleCI Docs Static Site:
 ### Initial Setup
 
 1. **Fork the repository**:
-   - Visit [https://github.com/circleci/circleci-docs-static](https://github.com/circleci/circleci-docs-static)
+   - Visit [https://github.com/circleci/circleci-docs](https://github.com/circleci/circleci-docs)
    - Click the "Fork" button to create your own copy
 
 2. **Clone your fork**:
    ```bash
-   git clone https://github.com/YOUR-USERNAME/circleci-docs-static.git
-   cd circleci-docs-static
+   git clone https://github.com/YOUR-USERNAME/circleci-docs.git
+   cd circleci-docs
    ```
 
 3. **Add the upstream remote**:
    ```bash
-   git remote add upstream https://github.com/circleci/circleci-docs-static.git
+   git remote add upstream https://github.com/circleci/circleci-docs.git
    ```
 
 4. **Install dependencies**:

DEVELOPMENT.md

@@ -23,8 +23,8 @@ This document provides comprehensive guidance for developers working on the Circ
 
 1. **Clone the repository**:
    ```bash
-   git clone https://github.com/circleci/circleci-docs-static.git
-   cd circleci-docs-static
+   git clone https://github.com/circleci/circleci-docs.git
+   cd circleci-docs
    ```
 
 2. **Install dependencies**: