Rebase 4.7 (#228)

* Test deploy permissions (#197)

* Test deploying to s3 bucket

* Add aws cli for testing

* Add contexts to test deploy job

* Try syncing the build directory to the bucket

* Move the deployment to the deploy-production job

* disable the aws setup on the preview deploy

* Api docs v2 formatting (#200)

* claude's attempt to configure how api v2 looks

* fix up some styling for the api v2 docs

* logo link back to API docs

* Add public-read permission to each file when syncing to s3 (#203)

* Move the deploy directory to match the kong redirect and add public read permissions when syncing files (#205)

* OKTA SSO group mappings docs (#178)

* OKTA SSO group mappings docs

* update screenshots plus some style and formatting fixes

* couple of style fixes

* fix lint errors in nav

---------

Co-authored-by: Rosie Yohannan <[email protected]>

* Remove preview prod deployment (#215)

* Remove disabled deploy command

* Add test menu link

* Add a new file to test deployment as well

* Add a file

* Remove the acl param from the s3 upload (#216)

* Clean up the deployment test files (#217)

* remove dropdown from view outside hamburger menu (#222)

* Add content for automatic reruns (#142)

* add new page for automatic reruns

* fixes from review

* add basic entry to configuration reference

* link to auto rerun docs from workflows page

* Update docs/guides/modules/orchestrate/pages/automatic-reruns.adoc

Co-authored-by: Sasha Lysenko <[email protected]>

* Update docs/guides/modules/orchestrate/pages/automatic-reruns.adoc

Co-authored-by: Sasha Lysenko <[email protected]>

* add screenshot and clarify UI indicators

* ui section again

* minor edits

* fix lint error

* Update docs/guides/modules/orchestrate/pages/automatic-reruns.adoc

* fixes from review

* clarifications for limitations

* remove line about scheduled workflows

---------

Co-authored-by: Sasha Lysenko <[email protected]>

* move API landing page into section to fix accordion (#224)

* fix link to server docs (#226)

* add server 4.7

* Update server 4.7 broken links (#202)

* fix broken links

* fix lint errors

* fix some tab labels

---------

Co-authored-by: Greg Roberts <[email protected]>
Co-authored-by: Dorothy Jane Wingrove <[email protected]>
Co-authored-by: Sasha Lysenko <[email protected]>

Author: 4 people

.circleci/config.yml

@@ -186,10 +186,6 @@ jobs:
   deploy-production:
     executor: node_executor
     parameters:
-      bucket_dir:
-        default: "dorian"
-        description: The directory in the bucket to deploy to.
-        type: string
       bucket_name:
         description: The name of the s3 bucket where static assets are stored.
         type: string
@@ -205,12 +201,11 @@ jobs:
           name: Deploy Production Site to S3
           command: |
             AWS_S3_BUCKET=<< parameters.bucket_name >>
-            BUCKET_DIRECTORY=<< parameters.bucket_dir >>
             BUILD_DIRECTORY=<< parameters.build_dir >>
 
             set -e
             echo "[INFO] Deploying production site..."
-            aws s3 cp "$BUILD_DIRECTORY" "s3://$AWS_S3_BUCKET/$BUCKET_DIRECTORY/" --recursive
+            aws s3 sync "$BUILD_DIRECTORY" "s3://$AWS_S3_BUCKET/"
       - notify_error:
           message: "Production deployment job failed for branch ${CIRCLE_BRANCH}"
 
@@ -276,15 +271,26 @@ workflows:
           filters:
             branches:
               ignore: main
-          context: circleci-docs-static
+          context:
+            [
+              circleci-docs-static,
+              docs-platform-assets,
+              web-ui-npm,
+              web-ui-datadog,
+            ]
       - deploy-production:
           requires: [validate]
           filters:
             branches:
               only: main
-          context: [circleci-docs-static, web-ui-org-settings, org-global]
-          bucket_dir: "dorian"
-          bucket_name: "circleci-docs-platform-assets/docs"
+          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 != ""

custom-template.hbs

@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf8" />
+  <title>{{title}}</title>
+  <!-- needed for adaptive design -->
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style>
+    body {
+      padding: 0;
+      margin: 0;
+    }
+
+    /* Custom logo styling - properly centered and clickable */
+    .custom-logo {
+      position: fixed;
+      top: 15px;
+      left: 15px;
+      z-index: 1001;
+      padding: 12px; /* Equal padding on all sides */
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: fit-content;
+      transition: all 0.2s ease;
+    }
+
+    .custom-logo a:hover {
+      transform: translateY(-1px);
+    }
+
+    .custom-logo img {
+      height: 32px;
+      width: auto;
+      display: block;
+    }
+
+    /* Adjust sidebar to avoid logo overlap */
+    .menu-content {
+      padding-top: 70px !important;
+    }
+
+    /* Hide logo on very small screens to avoid clutter */
+    @media (max-width: 480px) {
+      .custom-logo {
+        display: none;
+      }
+    }
+
+    /* Adjust for medium screens */
+    @media (max-width: 768px) {
+      .custom-logo {
+        position: relative;
+        top: 0;
+        left: 0;
+        margin: 15px auto;
+        display: block;
+        text-align: center;
+        max-width: none;
+        width: fit-content;
+        padding: 15px 20px;
+      }
+
+      .menu-content {
+        padding-top: 20px !important;
+      }
+    }
+  </style>
+  {{{redocHead}}}
+  {{#unless disableGoogleFont}}<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,700|Roboto:300,400,700" rel="stylesheet">{{/unless}}
+</head>
+
+<body>
+  <!-- Clickable logo that routes to docs homepage -->
+  <div class="custom-logo">
+    <a href="../../reference/api-homepage.html" title="Back to CircleCI Documentation">
+      <img src="logo.svg" alt="CircleCI" />
+    </a>
+  </div>
+
+  {{{redocHTML}}}
+</body>
+
+</html>

docs/guides/modules/ROOT/images/authentication/sso-group-mapping-okta-setup.png

@@ -38,6 +38,7 @@
 *** xref:orchestrate:pipelines.adoc[Pipeline and triggers overview]
 *** xref:orchestrate:jobs-steps.adoc[Jobs and steps overview]
 *** xref:orchestrate:workflows.adoc[Workflow orchestration]
+*** xref:orchestrate:automatic-reruns.adoc[Automatic reruns]
 *** xref:orchestrate:workspaces.adoc[Use workspaces to share data between jobs]
 *** xref:orchestrate:dynamic-config.adoc[Use dynamic configuration]
 *** xref:orchestrate:skip-build.adoc[Skip CI and cancel workflows]
@@ -91,7 +92,7 @@
 ** How-to guides
 *** xref:permissions-authentication:pull-an-image-from-aws-ecr-with-oidc.adoc[Pull an image from AWS ECR with OIDC]
 *** xref:execution-managed:run-a-job-in-a-container.adoc[Run a job in a container on your machine with Docker]
-*** xref:execution-managed:docker-compose.adoc[Installing and using docker-compose]
+*** xref:execution-managed:docker-compose.adoc[Installing and using Docker Compose]
 *** xref:execution-managed:high-uid-error.adoc[Debugging container ID cannot be mapped to host ID error]
 ** Image support policies
 *** xref:execution-managed:android-images-support-policy.adoc[Android images support policy]
@@ -188,7 +189,7 @@
 *** xref:deploy:deploy-ios-applications.adoc[Deploy iOS applications]
 *** xref:deploy:deploy-over-ssh.adoc[Deploy over SSH]
 *** xref:deploy:publish-packages-to-packagecloud.adoc[Publish packages to Packagecloud]
-*** xref:deploy:deploy-to-npm-registry.adoc[Deploy to NPM registry]
+*** xref:deploy:deploy-to-npm-registry.adoc[Deploy to npm registry]
 
 * Optimize
 ** xref:optimize:optimizations.adoc[Optimizations reference]
@@ -225,6 +226,7 @@
 ** SSO authentication
 *** xref:permissions-authentication:sso-overview.adoc[SSO overview]
 *** xref:permissions-authentication:set-up-sso.adoc[SSO setup]
+*** xref:permissions-authentication:sso-group-mapping.adoc[Set up SSO group mapping with Okta]
 *** xref:permissions-authentication:sign-in-to-an-sso-enabled-organization.adoc[Sign in to an SSO-enabled org]
 ** Multi-factor authentication (MFA)
 *** xref:permissions-authentication:mfa.adoc[MFA overview]
@@ -288,7 +290,7 @@
 
 * Developer toolkit
 ** AI features
-*** xref:toolkit:using-the-circleci-mcp-server.adoc[Using the CircleCI MCP Server]
+*** xref:toolkit:using-the-circleci-mcp-server.adoc[Using the CircleCI MCP server]
 *** xref:toolkit:intelligent-summaries.adoc[Intelligent summaries]
 ** CLI
 *** xref:toolkit:local-cli.adoc[Install and configure the CircleCI local CLI]
@@ -312,7 +314,7 @@
 * Plans and pricing
 ** xref:plans-pricing:plan-overview.adoc[CircleCI plans overview]
 ** xref:plans-pricing:credits.adoc[Credits overview]
-** xref:plans-pricing:plan-free.adoc[Free plan overview]
-** xref:plans-pricing:plan-performance.adoc[Performance plan overview]
-** xref:plans-pricing:plan-scale.adoc[Scale plan overview]
-** xref:plans-pricing:plan-server.adoc[Server plan overview]
+** xref:plans-pricing:plan-free.adoc[Free Plan overview]
+** xref:plans-pricing:plan-performance.adoc[Performance Plan overview]
+** xref:plans-pricing:plan-scale.adoc[Scale Plan overview]
+** xref:plans-pricing:plan-server.adoc[Server Plan overview]

docs/guides/modules/ROOT/images/authentication/sso-group-mapping-open.png

@@ -60,7 +60,7 @@ Some things consider during this phase:
 
 Ensure that your VCS org is linked to your CircleCI account and that your plan is applied. Log in using your VCS credentials as described on the xref:getting-started:first-steps.adoc[Sign Up and Try CircleCI] page.
 
-If using the Server product, ensure that you have been provided with your trial license and that all prerequisites are met as described in the xref:server-admin:installation:index.adoc[server installation guides].
+If using the Server product, ensure that you have been provided with your trial license and that all prerequisites are met as described in the xref:server-admin:ROOT:index.adoc[server installation guides].
 
 [#preparation-phase]
 == Preparation phase