Skip to content

Commit

Permalink
Adopt Cookbook (#62)
Browse files Browse the repository at this point in the history
  • Loading branch information
damacus authored Oct 3, 2023
1 parent b2cb725 commit 29001ff
Show file tree
Hide file tree
Showing 16 changed files with 264 additions and 70 deletions.
10 changes: 0 additions & 10 deletions .circleci/config.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .delivery/project.toml

This file was deleted.

48 changes: 48 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
---
name: "Test"

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

jobs:
lint-unit:
uses: sous-chefs/.github/.github/workflows/[email protected]
permissions:
actions: write
checks: write
pull-requests: write
statuses: write
issues: write


integration:
needs: "lint-unit"
runs-on: ubuntu-latest
strategy:
matrix:
os:
- windows-2016
suite:
- default
fail-fast: false
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Install Chef
uses: actionshub/[email protected]
- name: Dokken
uses: actionshub/[email protected]
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.dokken.yml
with:
suite: ${{ matrix.suite }}
os: ${{ matrix.os }}

final:
runs-on: ubuntu-latest
needs: [integration]
steps:
- run: echo ${{needs.integration.outputs}}
16 changes: 0 additions & 16 deletions .github/workflows/delivery.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/md-links.yml

This file was deleted.

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
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# webpi Cookbook CHANGELOG

This file is used to list changes made in each version of the webpi cookbook.

## Unreleased

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

## 4.2.3 - *2021-08-31*

- Standardise files with files in sous-chefs/repo-management
Expand Down Expand Up @@ -39,40 +42,53 @@ This file is used to list changes made in each version of the webpi cookbook.
- Update the minimum chef requirement to 12.1 from 12.0

## 3.0.0 (2016-09-06)

- Remove support for Chef 11

## 2.1.0 (2016-09-01)

- Resolve rubocop warnings
- Add use_inline_resources to the provider
- Add chef_version metadata
- Testing updates

## v2.0.0 (2016-01-04)

- Install WebPI 5.0 by default
- Fix runs on Chef 11 systems

## v1.2.9 (2015-12-30)

### Improvement

- Modernization of cookbook supporting travis ci, kitchen convergence testing, style checking and foodcritic rule compliance
- Removed unnecessary includes of the default recipe in the windows cookbook to eliminate warnings

## v1.2.8 (2014-02-14)

### Bug

- **[COOK-3832](https://tickets.chef.io/browse/COOK-3832)** - install-msi recipe should leverage chef cache

## v1.2.6

- [COOK-3372] - unzip webpi if webpi executable doesn't exist

## v1.2.4

### Improvement

- **[COOK-3474](https://tickets.chef.io/browse/COOK-3474)** - Upgrade WebPI (4.5 no longer exists)

## v1.2.2

### Improvement

- [COOK-2719]: update webpi documentation to show that Windows 2012
- and Windows 8 are supported

## v1.2.0

- [COOK-2298] - webpi will not install anything due to logic bug
- [COOK-1270] - webpi creates logs with timestamps in the name
- cluttering c:\
Expand All @@ -81,15 +97,19 @@ This file is used to list changes made in each version of the webpi cookbook.
- components to determine which to install if any

## v1.1.0

- [COOK-1251] - Fix LWRP "NotImplementedError"
- [COOK-1726, COOK-1760] - Upgrade to webpi version 4

## v1.0.4

- Created the ability to use the XML parameter for custom xml files.

## v1.0.2

- Ruby 1.9 compat fixes
- don't unzip if files already exist

## v1.0.0

- initial release
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ webpi_product 'WindowsAzurePowerShellGet' do
end
```


### webpi_application

#### Actions
Expand All @@ -93,6 +92,7 @@ end
- returns: specifies the return value(s) expected for a successful installation. Can be a single integer or array of integers. Default is [0, 42]

#### Examples

Installing WebMatrix while Accepting the EULA and also install app to IISExpress
Ex: >WebPICMD.exe /Install /Products:WebMatrix /AcceptEula /IISExpress

Expand All @@ -105,7 +105,7 @@ end
```

Installing an application to MicrosoftAzure ServiceFabric CoreSDK
Ex: >WebPICMD.exe /Install /Applications:MicrosoftAzure-ServiceFabric-CoreSDK /AcceptEula
Ex: >WebPICMD.exe /Install /Applications:MicrosoftAzure-ServiceFabric-CoreSDK /AcceptEula

```ruby
webpi_application 'MicrosoftAzure-ServiceFabric-CoreSDK' do
Expand All @@ -114,7 +114,6 @@ webpi_application 'MicrosoftAzure-ServiceFabric-CoreSDK' do
end
```


```ruby
password = data_bag_item('secrets','mysqlpassword')['password'] # Should be a encrypted data bag
webpi_application 'AcquiaDrupal' do
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
Loading

0 comments on commit 29001ff

Please sign in to comment.