Skip to content

Commit

Permalink
Merge branch 'main' into update_compose
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanlcarlson authored Apr 11, 2024
2 parents 1d9b40a + 8f4b3d9 commit b6ababd
Show file tree
Hide file tree
Showing 11 changed files with 712 additions and 249 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/mend.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: "mend"

on:
pull_request:
branches:
- "main"
pull_request_target:
types:
- opened
- synchronize
schedule:
- cron: "0 0 * * *"
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/spec/fixtures/modules/*
/tmp/
/vendor/
/convert_report.txt
Expand Down
9 changes: 3 additions & 6 deletions .pdkignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/spec/fixtures/modules/*
/tmp/
/vendor/
/convert_report.txt
Expand All @@ -26,20 +26,17 @@
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
/appveyor.yml
/.editorconfig
/.fixtures.yml
/Gemfile
/.gitattributes
/.github/
/.gitignore
/.gitlab-ci.yml
/.pdkignore
/.puppet-lint.rc
/Rakefile
/rakelib/
/.rspec
/.rubocop.yml
/.travis.yml
/..yml
/.yardopts
/spec/
/.vscode/
Expand Down
Loading

0 comments on commit b6ababd

Please sign in to comment.