prep for main

sous-chefs · Jun 16, 2021 · c1b785f · c1b785f
1 parent 302c045
commit c1b785f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 52 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,36 +5,36 @@ 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
 
   yamllint:
     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
@@ -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: