prep for main

This commit is contained in:
Jason Field 2021-06-16 17:32:32 +01:00
parent 9f82fc0266
commit 9dfe3a492e
2 changed files with 13 additions and 20 deletions

View File

@ -5,16 +5,16 @@ name: ci
pull_request: pull_request:
push: push:
branches: branches:
- master - main
jobs: jobs:
delivery: delivery:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out code - name: Check out code
uses: actions/checkout@master uses: actions/checkout@v2
- name: Run Chef Delivery - name: Run Chef Delivery
uses: actionshub/chef-delivery@master uses: actionshub/chef-delivery@main
env: env:
CHEF_LICENSE: accept-no-persist CHEF_LICENSE: accept-no-persist
@ -22,19 +22,19 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out code - name: Check out code
uses: actions/checkout@master uses: actions/checkout@v2
- name: Run yaml Lint - name: Run yaml Lint
uses: actionshub/yamllint@master uses: actionshub/yamllint@main
mdl: mdl:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out code - name: Check out code
uses: actions/checkout@master uses: actions/checkout@v2
- name: Run Markdown Lint - name: Run Markdown Lint
uses: actionshub/markdownlint@master uses: actionshub/markdownlint@main
dokken: integration:
needs: [mdl, yamllint, delivery] needs: [mdl, yamllint, delivery]
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
@ -63,11 +63,11 @@ jobs:
steps: steps:
- name: Check out code - name: Check out code
uses: actions/checkout@master uses: actions/checkout@v2
- name: Install Chef - name: Install Chef
uses: actionshub/chef-install@master uses: actionshub/chef-install@main
- name: Dokken - name: Dokken
uses: actionshub/kitchen-dokken@master uses: actionshub/test-kitchen@main
env: env:
CHEF_LICENSE: accept-no-persist CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.dokken.yml KITCHEN_LOCAL_YAML: kitchen.dokken.yml
@ -80,10 +80,3 @@ jobs:
set -x set -x
sudo journalctl -l --since today sudo journalctl -l --since today
KITCHEN_LOCAL_YAML=kitchen.dokken.yml /usr/bin/kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl -l" 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

View File

@ -4,14 +4,14 @@ name: md-links
"on": "on":
pull_request: pull_request:
push: push:
branches: [master] branches: [main]
jobs: jobs:
md-links: md-links:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out code - name: Check out code
uses: actions/checkout@main uses: actions/checkout@v2
- name: markdown-link-check - name: markdown-link-check
uses: gaurav-nelson/github-action-markdown-link-check@v1 uses: gaurav-nelson/github-action-markdown-link-check@v1
with: with: