From c1b785f5e9aeb860fbef9448cc86a784987621a4 Mon Sep 17 00:00:00 2001
From: Jason Field <jason@avon-lea.co.uk>
Date: Wed, 16 Jun 2021 17:31:14 +0100
Subject: [PATCH] prep for main

---
 .github/ISSUE_TEMPLATE.md        | 20 --------------------
 .github/PULL_REQUEST_TEMPLATE.md | 12 ------------
 .github/workflows/ci.yml         | 29 +++++++++++------------------
 .github/workflows/md-links.yml   |  4 ++--
 4 files changed, 13 insertions(+), 52 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md
 delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 651e753af..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,20 +0,0 @@
-### Cookbook version
-[Version of the cookbook where you are encountering the issue]
-
-### Chef-client version
-[Version of chef-client in your environment]
-
-### Platform Details
-[Operating system distribution and release version. Cloud provider if running in the cloud]
-
-### Scenario:
-[What you are trying to achieve and you can't?]
-
-### Steps to Reproduce:
-[If you are filing an issue what are the things we need to do in order to repro your problem? How are you using this cookbook or any resources it includes?]
-
-### Expected Result:
-[What are you expecting to happen as the consequence of above reproduction steps?]
-
-### Actual Result:
-[What actually happens after the reproduction steps? Include the error output or a link to a gist if possible.]
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 82b4b7380..000000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## Description
-
-[Describe what this change achieves]
-
-### Issues Resolved
-
-[List any existing issues this PR resolves]
-
-### Check List
-- [ ] All tests pass. See https://github.com/sous-chefs/mysql/blob/master/TESTING.md
-- [ ] New functionality includes testing.
-- [ ] New functionality has been documented in the README if applicable
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5934f8c8d..8e631c50e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,16 +5,16 @@ name: ci
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   delivery:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@master
+        uses: actions/checkout@v2
       - name: Run Chef Delivery
-        uses: actionshub/chef-delivery@master
+        uses: actionshub/chef-delivery@main
         env:
           CHEF_LICENSE: accept-no-persist
 
@@ -22,19 +22,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@master
+        uses: actions/checkout@v2
       - name: Run yaml Lint
-        uses: actionshub/yamllint@master
+        uses: actionshub/yamllint@main
 
   mdl:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@master
+        uses: actions/checkout@v2
       - name: Run Markdown Lint
-        uses: actionshub/markdownlint@master
+        uses: actionshub/markdownlint@main
 
-  dokken:
+  integration:
     needs: [mdl, yamllint, delivery]
     runs-on: ubuntu-latest
     strategy:
@@ -74,9 +74,9 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@master
+        uses: actions/checkout@v2
       - name: Install Chef
-        uses: actionshub/chef-install@master
+        uses: actionshub/chef-install@main
       # https://github.com/actions/virtual-environments/issues/181#issuecomment-610874237
       - name: Disable apparmor for mysqld
         run: |
@@ -85,7 +85,7 @@ jobs:
             sudo apt-get -y install apparmor-profiles
             sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: Dokken
-        uses: actionshub/kitchen-dokken@master
+        uses: actionshub/test-kitchen@main
         env:
           CHEF_LICENSE: accept-no-persist
           KITCHEN_LOCAL_YAML: kitchen.dokken.yml
@@ -100,10 +100,3 @@ jobs:
             sudo docker version
             sudo docker info
             KITCHEN_LOCAL_YAML=kitchen.dokken.yml /usr/bin/kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl -l"
-
-  final:
-    needs: [dokken]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@master
diff --git a/.github/workflows/md-links.yml b/.github/workflows/md-links.yml
index d3a2e2b2b..ba887a169 100644
--- a/.github/workflows/md-links.yml
+++ b/.github/workflows/md-links.yml
@@ -4,14 +4,14 @@ name: md-links
 "on":
   pull_request:
   push:
-    branches: [master]
+    branches: [main]
 
 jobs:
   md-links:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@main
+        uses: actions/checkout@v2
       - name: markdown-link-check
         uses: gaurav-nelson/github-action-markdown-link-check@v1
         with: