replace master with main (#128)

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
anchore · Aug 7, 2020 · a3a3e38 · a3a3e38
1 parent fa5d2b5
commit a3a3e38
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/acceptance-test.yaml b/.github/workflows/acceptance-test.yaml
@@ -1,9 +1,9 @@
 name: 'Acceptance'
 on:
   push:
-    # ... only act on pushes to master
+    # ... only act on pushes to main
     branches:
-      - master
+      - main
     # ... do not act on release tags
     tags-ignore:
       - v*

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,7 +1,7 @@
 name: 'Release'
 on:
   push:
-    # take no actions on push...
+    # take no actions on push to any branch...
     branches-ignore:
       - '**'
     # ... only act on release tags
@@ -16,12 +16,12 @@ jobs:
 
       - uses: actions/checkout@v2
 
-      # we don't want to release commits that have been pushed and tagged, but not necessarily merged onto master
-      - name: Ensure tagged commit is on master
+      # we don't want to release commits that have been pushed and tagged, but not necessarily merged onto main
+      - name: Ensure tagged commit is on main
         run: |
           echo "Tag: ${GITHUB_REF##*/}"
-          git fetch origin master
-          git merge-base --is-ancestor ${GITHUB_REF##*/} origin/master && echo "${GITHUB_REF##*/} is a commit on master!"
+          git fetch origin main
+          git merge-base --is-ancestor ${GITHUB_REF##*/} origin/main && echo "${GITHUB_REF##*/} is a commit on main!"
 
       - name: Check static anaylysis, unit, and integration test results
         uses: fountainhead/action-wait-for-check@v1.0.0