Skip to content

Commit

Permalink
Merge branch 'main' into feature/GH-476
Browse files Browse the repository at this point in the history
  • Loading branch information
damacus committed Oct 3, 2023
2 parents dddd19c + c909d28 commit 3186241
Show file tree
Hide file tree
Showing 19 changed files with 299 additions and 81 deletions.
10 changes: 0 additions & 10 deletions .circleci/config.yml

This file was deleted.

50 changes: 17 additions & 33 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,30 @@
---
name: ci

'on':
"on":
pull_request:
push:
branches:
- main
branches: [main]

jobs:
delivery:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Run Chef Delivery
uses: actionshub/chef-delivery@main
env:
CHEF_LICENSE: accept-no-persist

yamllint:
runs-on: ubuntu-latest
steps:
- name: Check out code
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@v2
- name: Run Markdown Lint
uses: actionshub/markdownlint@main
lint-unit:
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.6
with:
platform: windows-latest
permissions:
actions: write
checks: write
pull-requests: write
statuses: write
issues: write

integration:
needs: [mdl, yamllint, delivery]
needs: lint-unit
runs-on: windows-latest
strategy:
matrix:
os:
- 'windows-2019'
- "windows-2019"
suite:
- 'default'
- 'disable-default'
Expand All @@ -60,11 +44,11 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install Chef
uses: actionshub/chef-install@main
uses: actionshub/chef-install@2.0.4
- name: test-kitchen
uses: actionshub/test-kitchen@main
uses: actionshub/test-kitchen@2.1.0
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.exec.yml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/md-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: markdown-link-check
uses: gaurav-nelson/github-action-markdown-link-check@v1
uses: gaurav-nelson/github-action-markdown-link-check@1.0.15
with:
use-verbose-mode: "yes"
folder-path: "documentation"
19 changes: 0 additions & 19 deletions .github/workflows/mk-links.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
- uses: actions/stale@v8
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
close-issue-message: >
Expand Down
5 changes: 5 additions & 0 deletions .markdownlint-cli2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config:
ul-indent: false # MD007
line-length: false # MD013
no-duplicate-heading: false # MD024
reference-links-images: false # MD052
18 changes: 11 additions & 7 deletions .overcommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@ PreCommit:
enabled: true
YamlLint:
enabled: true
Rspec:
required_executable: "yamllint"
ChefSpec:
enabled: true
required_executable: 'rspec'
required_executable: "chef"
command: ["chef", "exec", "rspec"]
Cookstyle:
enabled: true
required_executable: 'cookstyle'
required_executable: "cookstyle"
command: ["cookstyle"]
Delivery:
enabled: true
required_executable: 'delivery'
flags: ['local', 'all']
MarkdownLint:
enabled: false
required_executable: "npx"
command: ["npx", "markdownlint-cli2", "'**/*.md'"]
include: ["**/*.md"]

CommitMsg:
HardTabs:
enabled: true
7 changes: 4 additions & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"recommendations": [
"chef-software.chef",
"rebornix.ruby",
"editorconfig.editorconfig"
"chef-software.chef",
"rebornix.ruby",
"editorconfig.editorconfig",
"DavidAnson.vscode-markdownlint"
]
}
2 changes: 2 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ rules:
max-spaces-inside: 1
min-spaces-inside-empty: -1
max-spaces-inside-empty: -1
comments:
min-spaces-from-content: 1
58 changes: 58 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,64 @@ This file is used to list changes made in each version of the iis cookbook.
## Unreleased

- Allow specifying install method for windows_feature resources

## 8.0.20 - *2023-09-28*

## 8.0.19 - *2023-09-04*

## 8.0.18 - *2023-09-04*

## 8.0.17 - *2023-06-01*

## 8.0.16 - *2023-04-17*

## 8.0.15 - *2023-04-07*

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

## 8.0.14 - *2023-04-01*

## 8.0.13 - *2023-04-01*

## 8.0.12 - *2023-04-01*

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

## 8.0.11 - *2023-03-20*

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

## 8.0.10 - *2023-03-15*

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

## 8.0.9 - *2023-03-02*

## 8.0.8 - *2023-02-23*

## 8.0.7 - *2023-02-23*

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

## 8.0.6 - *2023-02-16*

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

## 8.0.5 - *2023-02-15*

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

## 8.0.4 - *2023-02-14*

## 8.0.3 - *2022-12-11*

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

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

## 8.0.2 - *2022-02-17*

- Standardise files with files in sous-chefs/repo-management
- Remove delivery folder

## 8.0.1 - *2021-11-19*
Expand Down
2 changes: 1 addition & 1 deletion chefignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Dangerfile
examples/*
features/*
Guardfile
kitchen.yml*
kitchen*.yml
mlc_config.json
Procfile
Rakefile
Expand Down
113 changes: 113 additions & 0 deletions kitchen.dokken.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
driver:
name: dokken
privileged: true
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>

transport: { name: dokken }
provisioner: { name: dokken }

platforms:
- name: almalinux-8
driver:
image: dokken/almalinux-8
pid_one_command: /usr/lib/systemd/systemd

- name: almalinux-9
driver:
image: dokken/almalinux-9
pid_one_command: /usr/lib/systemd/systemd

- name: amazonlinux-2023
driver:
image: dokken/amazonlinux-2023
pid_one_command: /usr/lib/systemd/systemd

- name: centos-7
driver:
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd

- name: centos-stream-8
driver:
image: dokken/centos-stream-8
pid_one_command: /usr/lib/systemd/systemd

- name: centos-stream-9
driver:
image: dokken/centos-stream-9
pid_one_command: /usr/lib/systemd/systemd

- name: debian-9
driver:
image: dokken/debian-9
pid_one_command: /bin/systemd

- name: debian-10
driver:
image: dokken/debian-10
pid_one_command: /bin/systemd

- name: debian-11
driver:
image: dokken/debian-11
pid_one_command: /bin/systemd

- name: debian-12
driver:
image: dokken/debian-12
pid_one_command: /bin/systemd

- name: fedora-latest
driver:
image: dokken/fedora-latest
pid_one_command: /usr/lib/systemd/systemd

- name: opensuse-leap-15
driver:
image: dokken/opensuse-leap-15
pid_one_command: /usr/lib/systemd/systemd

- name: oraclelinux-7
driver:
image: dokken/oraclelinux-7
pid_one_command: /usr/lib/systemd/systemd

- name: oraclelinux-8
driver:
image: dokken/oraclelinux-8
pid_one_command: /usr/lib/systemd/systemd

- name: oraclelinux-9
driver:
image: dokken/oraclelinux-9
pid_one_command: /usr/lib/systemd/systemd

- name: rockylinux-8
driver:
image: dokken/rockylinux-8
pid_one_command: /usr/lib/systemd/systemd

- name: rockylinux-9
driver:
image: dokken/rockylinux-9
pid_one_command: /usr/lib/systemd/systemd

- name: ubuntu-18.04
driver:
image: dokken/ubuntu-18.04
pid_one_command: /bin/systemd

- name: ubuntu-20.04
driver:
image: dokken/ubuntu-20.04
pid_one_command: /bin/systemd

- name: ubuntu-22.04
driver:
image: dokken/ubuntu-22.04
pid_one_command: /bin/systemd

- name: ubuntu-23.04
driver:
image: dokken/ubuntu-23.04
pid_one_command: /bin/systemd
8 changes: 5 additions & 3 deletions kitchen.exec.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
driver:
name: exec
---
driver: { name: exec }
transport: { name: exec }

platforms:
- name: windows-2019
- name: macos-latest
- name: windows-latest
Loading

0 comments on commit 3186241

Please sign in to comment.