Skip to content

Commit c1b785f

Browse files
committed
prep for main
1 parent 302c045 commit c1b785f

File tree

4 files changed

+13
-52
lines changed

4 files changed

+13
-52
lines changed

.github/ISSUE_TEMPLATE.md

-20
This file was deleted.

.github/PULL_REQUEST_TEMPLATE.md

-12
This file was deleted.

.github/workflows/ci.yml

+11-18
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,36 @@ name: ci
55
pull_request:
66
push:
77
branches:
8-
- master
8+
- main
99

1010
jobs:
1111
delivery:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Check out code
15-
uses: actions/checkout@master
15+
uses: actions/checkout@v2
1616
- name: Run Chef Delivery
17-
uses: actionshub/chef-delivery@master
17+
uses: actionshub/chef-delivery@main
1818
env:
1919
CHEF_LICENSE: accept-no-persist
2020

2121
yamllint:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Check out code
25-
uses: actions/checkout@master
25+
uses: actions/checkout@v2
2626
- name: Run yaml Lint
27-
uses: actionshub/yamllint@master
27+
uses: actionshub/yamllint@main
2828

2929
mdl:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Check out code
33-
uses: actions/checkout@master
33+
uses: actions/checkout@v2
3434
- name: Run Markdown Lint
35-
uses: actionshub/markdownlint@master
35+
uses: actionshub/markdownlint@main
3636

37-
dokken:
37+
integration:
3838
needs: [mdl, yamllint, delivery]
3939
runs-on: ubuntu-latest
4040
strategy:
@@ -74,9 +74,9 @@ jobs:
7474

7575
steps:
7676
- name: Check out code
77-
uses: actions/checkout@master
77+
uses: actions/checkout@v2
7878
- name: Install Chef
79-
uses: actionshub/chef-install@master
79+
uses: actionshub/chef-install@main
8080
# https://github.com/actions/virtual-environments/issues/181#issuecomment-610874237
8181
- name: Disable apparmor for mysqld
8282
run: |
@@ -85,7 +85,7 @@ jobs:
8585
sudo apt-get -y install apparmor-profiles
8686
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
8787
- name: Dokken
88-
uses: actionshub/kitchen-dokken@master
88+
uses: actionshub/test-kitchen@main
8989
env:
9090
CHEF_LICENSE: accept-no-persist
9191
KITCHEN_LOCAL_YAML: kitchen.dokken.yml
@@ -100,10 +100,3 @@ jobs:
100100
sudo docker version
101101
sudo docker info
102102
KITCHEN_LOCAL_YAML=kitchen.dokken.yml /usr/bin/kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl -l"
103-
104-
final:
105-
needs: [dokken]
106-
runs-on: ubuntu-latest
107-
steps:
108-
- name: Check out code
109-
uses: actions/checkout@master

.github/workflows/md-links.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ name: md-links
44
"on":
55
pull_request:
66
push:
7-
branches: [master]
7+
branches: [main]
88

99
jobs:
1010
md-links:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out code
14-
uses: actions/checkout@main
14+
uses: actions/checkout@v2
1515
- name: markdown-link-check
1616
uses: gaurav-nelson/github-action-markdown-link-check@v1
1717
with:

0 commit comments

Comments
 (0)