Skip to content

Commit

Permalink
Merge branch 'main' into gh-204
Browse files Browse the repository at this point in the history
  • Loading branch information
damacus authored Sep 1, 2021
2 parents c96f586 + 5af694e commit 2d8d619
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 19 deletions.
10 changes: 9 additions & 1 deletion .delivery/project.toml
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
remote_file = "https://raw.githubusercontent.com/chef-cookbooks/community_cookbook_tools/master/delivery/project.toml"
[local_phases]
unit = "rspec spec/"
lint = 'cookstyle --display-cop-names --extra-details'
syntax = "echo skipping"
provision = "echo skipping"
deploy = "echo skipping"
smoke = "echo skipping"
functional = "echo skipping"
cleanup = "echo skipping"
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @chef-cookbooks/cookbook_engineering_team
* @sous-chefs/maintainers
21 changes: 7 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ name: ci
pull_request:
push:
branches:
- master
- main

jobs:
delivery:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@main
uses: actions/checkout@v2
- name: Run Chef Delivery
uses: actionshub/chef-delivery@main
env:
Expand All @@ -22,19 +22,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@main
uses: actions/checkout@v2
- name: Run yaml Lint
uses: actionshub/yamllint@main

mdl:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@main
uses: actions/checkout@v2
- name: Run Markdown Lint
uses: actionshub/markdownlint@main

dokken:
integration:
needs: [mdl, yamllint, delivery]
runs-on: ubuntu-latest
strategy:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@main
uses: actions/checkout@v2
- name: Install Chef
uses: actionshub/chef-install@main
- name: Dokken
Expand All @@ -82,11 +82,4 @@ jobs:
run: |
set -x
sudo journalctl -l --since today
KITCHEN_LOCAL_YAML=kitchen.dokken.yml kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl -l"
final:
needs: [dokken]
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@main
KITCHEN_LOCAL_YAML=kitchen.dokken.yml /usr/bin/kitchen exec ${{ matrix.suite }}-${{ matrix.os }} -c "journalctl -l"
4 changes: 2 additions & 2 deletions .github/workflows/md-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ This file is used to list changes made in each version of the splunk cookbook.
- Renames inspec files to end with `_test.rb` rather than `_spec.rb` to distinguish from chefspec files
- Fixes quotation marks used in the `init shcluster-config` command when initializing a search head cluster member

## 7.2.2 - *2021-08-30*

- Standardise files with files in sous-chefs/repo-management

## 7.2.1 - *2021-06-01*

- Standardise files with files in sous-chefs/repo-management

## 7.2.0 - *2021-03-12*

- Sous Chefs Adoption
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
maintainer_email 'help@sous-chefs.org'
license 'Apache-2.0'
description 'Manage Splunk Enterprise or Splunk Universal Forwarder'
version '7.2.0'
version '7.2.2'
source_url 'https://github.com/sous-chefs/chef-splunk'
issues_url 'https://github.com/sous-chefs/chef-splunk/issues'
chef_version '>= 15.3'
Expand Down

0 comments on commit 2d8d619

Please sign in to comment.