Skip to content

Commit 88d2849

Browse files
committed
Fix remaining merge conflicts
1 parent 80adc08 commit 88d2849

5 files changed

Lines changed: 10 additions & 12 deletions

File tree

content/learning-paths/servers-and-cloud-computing/circleci-on-aws/_index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: Deploy CircleCI Arm Native Workflows on AWS EC2 Graviton2
2+
title: Deploy CircleCI Arm Native Workflows on AWS EC2 Graviton
33

44
minutes_to_complete: 30
55

6-
who_is_this_for: This is an introductory topic for developers and DevOps engineers who want to set up and run CircleCI Arm native workflows on Linux Arm64 virtual machines. You'll use AWS EC2 Graviton2 instances (Neoverse N1) and self-hosted runners.
6+
who_is_this_for: This is an introductory topic for developers and DevOps engineers who want to set up and run CircleCI Arm native workflows on Linux Arm64 virtual machines. You'll use AWS EC2 Graviton instances (Neoverse N1) and self-hosted runners.
77

88
learning_objectives:
9-
- Create an AWS EC2 Graviton2 Arm64 virtual machine
9+
- Create an AWS EC2 Graviton Arm64 virtual machine
1010
- Install and configure CircleCI self-hosted machine runners on Arm64
1111
- Verify the runner by running a simple workflow and test computation
1212

content/learning-paths/servers-and-cloud-computing/circleci-on-aws/background.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ weight: 2
66
layout: "learningpathall"
77
---
88

9-
## AWS Graviton2 Arm instances on Amazon EC2
10-
11-
## AWS Graviton Arm Instances on Amazon EC2
9+
## AWS Graviton Arm instances on Amazon EC2
1210

1311
AWS Graviton is a family of Arm-based processors designed by AWS and built on Arm Neoverse-N1 cores. These instances deliver price-to-performance efficiency, making them suitable for compute-intensive workloads such as CI/CD pipelines, microservices, containerized applications, and data processing tasks.
1412

content/learning-paths/servers-and-cloud-computing/circleci-on-aws/circleci-runner-installation.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
title: Install CircleCI machine runner on AWS Graviton2
2+
title: Install CircleCI machine runner on AWS Graviton
33
weight: 6
44

55
### FIXED, DO NOT MODIFY
66
layout: learningpathall
77
---
88

9-
## Install CircleCI machine runner on AWS Graviton2
9+
## Install CircleCI machine runner on AWS Graviton
1010

1111
This section provides step-by-step instructions to install and configure the CircleCI Machine Runner. With this setup, your self-hosted Arm64 environment can efficiently execute CircleCI jobs directly on the Graviton architecture, enabling faster builds and improved performance for ARM-based workloads.
1212

1313

1414
### Add the CircleCI package repository
15-
For Debian/Ubuntu-based systems running on AWS Graviton2 (Arm64), first add the official CircleCI repository. This ensures you can install the CircleCI Runner package directly using `apt`.
15+
For Debian/Ubuntu-based systems running on AWS Graviton (Arm64), first add the official CircleCI repository. This ensures you can install the CircleCI Runner package directly using `apt`.
1616

1717
```console
1818
curl -s https://packagecloud.io/install/repositories/circleci/runner/script.deb.sh?any=true | sudo bash
@@ -79,4 +79,4 @@ This confirms that the CircleCI Runner is actively connected to your CircleCI ac
7979

8080
You can also verify it from the dashboard:
8181

82-
![Diagram showing the CircleCI self-hosted runner architecture. The main subject is an AWS Graviton2 server labeled as a self-hosted runner, connected to the CircleCI cloud platform. Arrows indicate job requests flowing from CircleCI to the runner and job results returning to CircleCI. The environment includes icons for cloud infrastructure and developer workstations. The tone is technical and informative. Any visible text in the image is transcribed as: Self-Hosted Runners. alt-text#center](images/runner.png "Self-Hosted Runners ")
82+
![Diagram showing the CircleCI self-hosted runner architecture. The main subject is an AWS Graviton server labeled as a self-hosted runner, connected to the CircleCI cloud platform. Arrows indicate job requests flowing from CircleCI to the runner and job results returning to CircleCI. The environment includes icons for cloud infrastructure and developer workstations. The tone is technical and informative. Any visible text in the image is transcribed as: Self-Hosted Runners. alt-text#center](images/runner.png "Self-Hosted Runners ")

content/learning-paths/servers-and-cloud-computing/circleci-on-aws/circlecli-installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ weight: 4
66
layout: learningpathall
77
---
88

9-
## Install CircleCI CLI on AWS Graviton2 (Neoverse N1) instance
9+
## Install CircleCI CLI on your instance
1010
This guide walks you through how to install the CircleCI command line interface (CLI). With the CLI, you can work with CircleCI from your terminal to check configuration files, manage pipelines, and run self-hosted runners on your EC2 instance.
1111

1212
## Install the required packages

content/learning-paths/servers-and-cloud-computing/circleci-on-aws/instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Create an AWS EC2 Arm64 Graviton2 Instance
2+
title: Create an AWS EC2 Arm64 Graviton Instance
33
weight: 3
44

55
### FIXED, DO NOT MODIFY

0 commit comments

Comments
 (0)