Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PHPUnit 10 Shift #47

Merged
merged 8 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
2fb8cfa9f5a0710ab2d5fc9cd216a742390613a4
cea5e1493e7fd194d9130c8b57c13fd6968e2cae
a7f19877c5aa0bacf0e1c8c8272a5e7bbd0f019b
ff2f09f4b4b299eecdcd0bea02e24c76373664fd
33 changes: 5 additions & 28 deletions .github/workflows/duster.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,17 @@
name: Duster Fix
name: Run Duster

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

jobs:
duster:
runs-on: ubuntu-latest

permissions:
contents: write

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}

- name: "Duster Fix"
- name: "duster"
uses: tighten/duster-action@v3
with:
args: fix

- uses: stefanzweifel/git-auto-commit-action@v4
id: auto_commit_action
with:
commit_message: Dusting
commit_user_name: GitHub Action
commit_user_email: actions@github.com

- name: Ignore Duster commit in git blame
if: steps.auto_commit_action.outputs.changes_detected == 'true'
run: echo ${{ steps.auto_commit_action.outputs.commit_hash }} >> .git-blame-ignore-revs

- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Ignore Dusting commit in git blame
commit_user_name: GitHub Action
commit_user_email: actions@github.com
args: lint
11 changes: 4 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
name: tests
name: Run Tests

on:
# Commits made in Duster Fix will not trigger any workflows
# Tests are configured to run after the workflow finishes
workflow_run:
workflows: ["Duster Fix"]
types:
- completed
push:
branches: [ main ]
pull_request:

jobs:
test:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.env
.env.backup
.env.testing
.phpunit.result.cache
/.phpunit.cache
docker-compose.override.yml
Homestead.json
Homestead.yaml
Expand All @@ -17,3 +17,4 @@ yarn-error.log
/.idea
/.vscode
phpunit.xml
.phpunit.result.cache
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"fakerphp/faker": "^1.9.1",
"laravel/sail": "^1.18",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^6.1",
"phpunit/phpunit": "^9.3.3",
"nunomaduro/collision": "^7.0",
"phpunit/phpunit": "^10.0",
"spatie/laravel-ignition": "^2.0",
"tightenco/duster": "^3.0"
},
Expand Down
Loading
Loading