Merge pull request circleci#8466 from circleci/fixes

remove incorrect use of machine: true

Author: rosieyohannan

jekyll/_cci2/migrating-from-github.adoc

@@ -19,7 +19,7 @@ This document provides an overview of how to migrate from GitHub Actions to Circ
 [#jobs-and-workflows]
 === Jobs and workflows
 
-Both GitHub Actions and CircleCI share similar concepts around "jobs" and "workflows". A workflow is an end-to-end flow of connected jobs, which in turn consist of commands to achieve an atomic task (e.g. "run unit tests" or "build a Docker image").
+Both GitHub Actions and CircleCI share similar concepts around "jobs" and "workflows". A workflow is an end-to-end flow of connected jobs, which in turn consist of commands to achieve an atomic task (for example, "run unit tests" or "build a Docker image").
 
 CircleCI differs primarily in configuration syntax, setting up workflow and job dependencies in a separate section as opposed to inline in the job.
 
@@ -122,15 +122,17 @@ docker:
   - image: cimg/openjdk:17.0
 
 # Linux Ubuntu Executor
-machine: true
+machine:
+  image: ubuntu-2004:202010-01
 
 # macOS Executor
 macos:
   xcode: 14.2.0
 
 # Windows Executor
-# NOTE: Orb declaration needed. See docs
-executor: win/vs2019
+machine:
+  image: 'windows-server-2022-gui:current'
+resource_class: windows.medium # can be medium, large, xlarge, 2xlarge
 ----
 
 2+| Specifying dependencies/services. All images specified after the first in CircleCI are treated https://circleci.com/docs/configuration-reference/#docker[as dependencies].
@@ -239,8 +241,8 @@ jobs:
           webhook: # WEBHOOK
 ----
 
-2+| Using conditional steps in the workflow. CircleCI offers https://circleci.com/docs/configuration-reference/#the-when-attribute[basic conditions on steps] (e.g., on_success [default], +
-on_success, on_failure) as well as https://circleci.com/docs/configuration-reference/#the-when-step[conditional steps] based on parameters. We also have https://circleci.com/docs/reusing-config/#using-the-parameters-declaration[conditional jobs], and +
+2+| Using conditional steps in the workflow. CircleCI offers https://circleci.com/docs/configuration-reference/#the-when-attribute[basic conditions on steps] (for example, `on_success` [default], +
+`on_success`, `on_failure`) as well as https://circleci.com/docs/configuration-reference/#the-when-step[conditional steps] based on parameters. We also have https://circleci.com/docs/reusing-config/#using-the-parameters-declaration[conditional jobs], and +
 currently conditional, parameterized workflows and pipelines https://github.com/CircleCI-Public/api-preview-docs/blob/master/docs/conditional-workflows.md[are in preview].
 
 a|

jekyll/_cci2/pipeline-variables.adoc

@@ -160,7 +160,9 @@ commands:
 
 jobs:
   daily-message:
-    machine: true
+    machine:
+      image: ubuntu-2004:current
+    resource_class: large
     parameters:
       message:
         type: string

jekyll/_cci2/private-images.adoc

@@ -90,7 +90,9 @@ workflows:
 
 jobs:
   machine-job:
-    machine: true
+    machine:
+      image: ubuntu-2004:current
+    resource_class: large
     steps:
       - docker/check:
           docker-username: DOCKERHUB_LOGIN  # DOCKER_LOGIN is the default value, if it exists, it automatically would be used.
@@ -109,7 +111,9 @@ Or with the CLI:
 version: 2.1
 jobs:
   build:
-    machine: true
+    machine:
+      image: ubuntu-2004:current
+    resource_class: large
     working_directory: ~/my_app
     steps:
       # Docker is preinstalled, along with docker-compose

jekyll/_cci2/reusing-config.md

@@ -165,7 +165,8 @@ jobs:
         type: integer
         default: 1
     parallelism: << parameters.p >>
-    machine: true
+    docker:
+      - image: cimg/base:2023.11
     steps:
       - checkout
 workflows:
@@ -298,7 +299,8 @@ commands:
 
 jobs:
   build:
-    machine: true
+    docker:
+      - image: cimg/base:2023.11
     steps:
       - run-tests:
           after-deps:
@@ -699,7 +701,8 @@ version: 2.1
 # Yaml from foo-orb
 executors:
   bar:
-    machine: true
+    docker:
+      - image: cimg/base:2023.11
     environment:
       RUN_TESTS: foobar
 ```
@@ -793,7 +796,8 @@ jobs:
         description: "To whom shall we say hello?"
         default: "World"
         type: string
-    machine: true
+    docker:
+      - image: cimg/base:2023.11
     steps:
       - run: echo "Hello << parameters.saywhat >>"
 
@@ -839,7 +843,8 @@ jobs:
         description: "To whom shall we say hello?"
         default: "World"
         type: string
-    machine: true
+    docker:
+      - image: cimg/base:2023.11
     steps:
       - saywhat:
           saywhat: "<< parameters.saywhat >>"
@@ -925,7 +930,8 @@ jobs:
         description: "To whom shall we say hello?"
         default: "World"
         type: string
-    machine: true
+    docker:
+      - image: cimg/base:2023.11
     steps:
       - say:
           # Since the command "say" doesn't define a default
@@ -996,7 +1002,8 @@ The following example defines pre-steps and post-steps in the `bar` job of the `
 version: 2.1
 jobs:
   bar:
-    machine: true
+    docker:
+      - image: cimg/base:2023.11
     steps:
       - checkout
       - run:
@@ -1039,7 +1046,8 @@ jobs:
       preinstall-foo:
         type: boolean
         default: false
-    machine: true
+    docker:
+      - image: cimg/base:2023.11
     steps:
       - run: echo "preinstall is << parameters.preinstall-foo >>"
       - when:

jekyll/_cci2/selecting-a-workflow-to-run-using-pipeline-parameters.adoc

@@ -33,13 +33,15 @@ parameters:
 
 jobs:
   build:
-    machine: true
+    docker:
+      - image: cimg/base:2023.11
     steps:
       - checkout
       - run: ./run-tests.sh
 
   report:
-    machine: true
+    docker:
+      - image: cimg/base:2023.11
     steps:
       - checkout
       - run: ./create-report.sh

jekyll/_data/sidenav.yml

@@ -264,8 +264,6 @@ en:
             link: runner-config-reference
       - name: How-to Guides
         children:
-          - name: Upgrading machine runner on cloud
-            link: upgrading-circleci-machine-runner-on-cloud
           - name: Upgrade machine runner on server
             link: runner-upgrading-on-server
       - name: Reference