Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/actions/cache-4
Browse files Browse the repository at this point in the history
  • Loading branch information
bloep authored Feb 14, 2024
2 parents 51d80ae + 0703906 commit 98b55a0
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 18 deletions.
19 changes: 19 additions & 0 deletions .github/.kodiak.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# .kodiak.toml
version = 1

[merge]
method = "squash"
delete_branch_on_merge = true
dont_wait_on_status_checks = ["WIP"] # handle github.com/apps/wip
# label to use to enable Kodiak to merge a PR
automerge_label = "automerge" # default: "automerge"
# require that the automerge label be set for Kodiak to merge a PR. if you
# disable this Kodiak will immediately attempt to merge every PR you create
require_automerge_label = true

[merge.message]
title = "pull_request_title"
body = "empty"
include_coauthors = true
include_pr_number = true
strip_html_comments = true # remove html comments to auto remove PR templates
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
- name: install graphviz
run: sudo apt-get install graphviz

- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: "ramsey/composer-install@v1"
- uses: "ramsey/composer-install@v2"
with:
composer-options: "--ansi --prefer-dist"

Expand Down
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"config": {
"platform": {
"php": "7.4"
"php": "8.1"
},
"allow-plugins": {
"phpdocumentor/shim": true
}
},
"require": {
Expand Down
30 changes: 15 additions & 15 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 98b55a0

Please sign in to comment.