Updates to adapt to default branch as main (aws#637)

taohungyang · Nov 17, 2022 · 214d5a2 · 214d5a2
1 parent c855010
commit 214d5a2
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/build-test-linux.yml b/.github/workflows/build-test-linux.yml
@@ -4,7 +4,8 @@
 name: build-and-test-linux
 on:
   push:
-    branches: [master, main]
+    branches:
+      - main
     paths-ignore:
       - '**/*.md'
       - '.github/**'

diff --git a/.github/workflows/build-test-macos.yml b/.github/workflows/build-test-macos.yml
@@ -4,7 +4,8 @@
 name: build-and-test-macos
 on:
   push:
-    branches: [master, main]
+    branches:
+      - main
     paths-ignore:
       - '**/*.md'
       - '.github/**'

diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml
@@ -4,7 +4,8 @@
 name: build-and-test-windows
 on:
   push:
-    branches: [master, main]
+    branches:
+      - main
     paths-ignore:
       - '**/*.md'
       - '.github/**'

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -5,7 +5,8 @@ name: CodeQL Analysis
 
 on:
   push:
-    branches: [master, main]
+    branches:
+      - main
 
 concurrency:
   group: codeql-${{ github.ref_name }}

diff --git a/.github/workflows/integrationTest.yml b/.github/workflows/integrationTest.yml
@@ -18,7 +18,7 @@ env:
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 
 concurrency:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail
 ## Contributing via Pull Requests
 Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
 
-1. You are working against the latest source on the *master* branch.
+1. You are working against the latest source on the *main* branch.
 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
 3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![codecov](https://codecov.io/gh/aws/amazon-cloudwatch-agent/branch/master/graph/badge.svg?token=79VYANUGOM)](https://codecov.io/gh/aws/amazon-cloudwatch-agent)
+[![codecov](https://codecov.io/gh/aws/amazon-cloudwatch-agent/branch/main/graph/badge.svg?token=79VYANUGOM)](https://codecov.io/gh/aws/amazon-cloudwatch-agent)
 
 # Amazon CloudWatch Agent
 The Amazon CloudWatch Agent is software developed for the [CloudWatch Agent](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Install-CloudWatch-Agent.html)
@@ -100,7 +100,7 @@ For example, the following excerpt of the CloudWatch agent configuration file pu
           "expression": "P(UT|OST)"
         }
       ]
-    },
+    }
   ]
 }
 ```
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ env: @@
     on:
       push:
         branches:
-          - master
+          - main
       workflow_dispatch:
     concurrency:
@@ Expand Down @@