bump a bunch of CI to main

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

8 files changed, 15 insertions, 15 deletions

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 8bb4e33944..f8c6e9e778 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -236,10 +236,10 @@ subscriptions:
     actions:
       - bash:.expeditor/update_dep.sh
   # NOTE: The branch of Ohai here needs to be updated when setting up a stable branch of chef/chef
-  - workload: chef/ohai:master_completed:pull_request_merged:chef/ohai:master:*
+  - workload: chef/ohai:main_completed:pull_request_merged:chef/ohai:main:*
     actions:
       - bash:.expeditor/update_bundler_dep.sh
   # NOTE: When the stable branch of chef/chef is being cut you probably want to remove this subscription
-  - workload: chef/chefstyle:master_completed:pull_request_merged:chef/chefstyle:master:*
+  - workload: chef/chefstyle:main_completed:pull_request_merged:chef/chefstyle:main:*
     actions:
       - bash:.expeditor/update_bundler_dep.sh
diff --git a/.expeditor/scripts/install-hab.sh b/.expeditor/scripts/install-hab.sh
index 75e910bfab..aaf2dfee5f 100755
--- a/.expeditor/scripts/install-hab.sh
+++ b/.expeditor/scripts/install-hab.sh
@@ -20,5 +20,5 @@ error () {
 
 echo "--- :habicat: Installing latest version of Habitat"
 rm -rf /hab
-curl https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh | bash -s -- -t "$hab_target"
+curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | bash -s -- -t "$hab_target"
 hab license accept
diff --git a/.expeditor/update_bundler_dep.sh b/.expeditor/update_bundler_dep.sh
index 71575a6c76..375fc3daf0 100755
--- a/.expeditor/update_bundler_dep.sh
+++ b/.expeditor/update_bundler_dep.sh
@@ -24,6 +24,6 @@ git commit --message "Bump $EXPEDITOR_REPO to $EXPEDITOR_LATEST_COMMIT" --messag
 
 open_pull_request "$EXPEDITOR_BRANCH"
 
-# Get back to master and cleanup the leftovers - any changed files left over at the end of this script will get committed to master.
+# Get back to main and cleanup the leftovers - any changed files left over at the end of this script will get committed to main.
 git checkout -
 git branch -D "$branch"
diff --git a/.expeditor/update_dep.sh b/.expeditor/update_dep.sh
index 55258c66f8..5e9125cd04 100755
--- a/.expeditor/update_dep.sh
+++ b/.expeditor/update_dep.sh
@@ -41,6 +41,6 @@ git commit --message "Bump $DEPNAME to $EXPEDITOR_VERSION" --message "This pull
 
 open_pull_request "$EXPEDITOR_BRANCH"
 
-# Get back to master and cleanup the leftovers - any changed files left over at the end of this script will get committed to master.
+# Get back to main and cleanup the leftovers - any changed files left over at the end of this script will get committed to main.
 git checkout -
 git branch -D "$branch"
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 9e3f0669ab..5bbfb25e9c 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -280,7 +280,7 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle config set --local without omnibus_package
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle
-    - bundle exec tasks/bin/run_external_test chef/chef-zero master rake pedant
+    - bundle exec tasks/bin/run_external_test chef/chef-zero main rake pedant
   expeditor:
     executor:
       docker:
@@ -294,7 +294,7 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle config set --local without omnibus_package
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle
-    - bundle exec tasks/bin/run_external_test chef/cheffish master rake spec
+    - bundle exec tasks/bin/run_external_test chef/cheffish main rake spec
   expeditor:
     executor:
       docker:
@@ -305,7 +305,7 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle config set --local without omnibus_package
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle
-    - bundle exec tasks/bin/run_external_test chefspec/chefspec master rake
+    - bundle exec tasks/bin/run_external_test chefspec/chefspec main rake
   expeditor:
     executor:
       docker:
@@ -316,7 +316,7 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle config set --local without omnibus_package
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle
-    - bundle exec tasks/bin/run_external_test chef/knife-windows master rake spec
+    - bundle exec tasks/bin/run_external_test chef/knife-windows main rake spec
   expeditor:
     executor:
       docker:
@@ -329,7 +329,7 @@ steps:
     - apt-get install -y graphviz
     - bundle config set --local without omnibus_package
     - bundle install --jobs=3 --retry=3 --path=vendor/bundle
-    - bundle exec tasks/bin/run_external_test berkshelf/berkshelf master rake
+    - bundle exec tasks/bin/run_external_test berkshelf/berkshelf main rake
   expeditor:
     executor:
       docker:
diff --git a/.github/workflows/func_spec.yml b/.github/workflows/func_spec.yml
index 5913fc31f4..70089b4bb1 100644
--- a/.github/workflows/func_spec.yml
+++ b/.github/workflows/func_spec.yml
@@ -5,7 +5,7 @@ name: func_spec
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   choco:
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 5fa865bb34..09bd3b0cf8 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -5,7 +5,7 @@ name: kitchen
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   windows:
@@ -113,7 +113,7 @@ jobs:
       CHEF_LICENSE: accept-no-persist
     steps:
       - name: Check out code
-        uses: actions/checkout@master
+        uses: actions/checkout@main
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9ea4b32227..1b9daa6aba 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,7 +5,7 @@ name: lint
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   chefstyle:
@@ -28,7 +28,7 @@ jobs:
       - uses: carlosperate/download-file-action@v1.0.3
         id: download-custom-dictionary
         with:
-          file-url: 'https://raw.githubusercontent.com/chef/chef_dictionary/master/chef.txt'
+          file-url: 'https://raw.githubusercontent.com/chef/chef_dictionary/main/chef.txt'
           file-name: 'chef_dictionary.txt'
       - uses: zwaldowski/cspell-action@v1
         with: