Merge pull request #224 from openziti/switch-to-main

Switch to main
openziti · Jan 28, 2021 · 7c9e028 · 7c9e028
2 parents 2eb40ef + e5c974c
commit 7c9e028
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ '**' ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:
@@ -44,4 +44,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: ziti-prox-c-${{ runner.os }}
-          path: ziti-prox-c-${{ runner.os }}.zip
+          path: ziti-prox-c-${{ runner.os }}.zip
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
@@ -3,7 +3,7 @@ name: Release Drafter
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   update_release_draft:
@@ -12,4 +12,4 @@ jobs:
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - uses: release-drafter/release-drafter@v5
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -71,7 +71,7 @@ add_custom_target(publish
         COMMENT "generate publish specs"
         )
 
-if(${GIT_BRANCH} STREQUAL master)
+if(${GIT_BRANCH} STREQUAL main)
     set(PUB_PFX ziti-staging)
 else()
     set(PUB_PFX ziti-snapshot/${GIT_BRANCH})