Merge branch 'dev'

thiagoprz · Apr 5, 2022 · d5cc3db · d5cc3db
2 parents 61f0f04 + 8758aac
commit d5cc3db
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,9 +2,9 @@ name: Tests
 
 on:
   push:
-    branches: [ dev ]
+    branches: [ dev, master ]
   pull_request:
-    branches: [ dev ]
+    branches: [ dev, master ]
 
 jobs:
   laravel-tests:

diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@ Easy to use Laravel CRUD package with Controller, Model and Log system built in.
 
 
 [![Documentation Status](https://readthedocs.org/projects/laravel-crud-tools/badge/?version=latest)](https://laravel-crud-tools.readthedocs.io/en/latest/?badge=latest)
-![Tests](https://github.com/thiagoprz/crud-tools/actions/workflows/tests.yml/badge.svg)
-
+[![Dev](https://github.com/thiagoprz/crud-tools/actions/workflows/tests.yml/badge.svg?branch=dev)](https://github.com/thiagoprz/crud-tools/actions/workflows/tests.yml)
+[![Master](https://github.com/thiagoprz/crud-tools/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/thiagoprz/crud-tools/actions/workflows/tests.yml)
 
 ## Table of contents
 * [Installation](#installation)

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     "require": {
         "php": "^7.4 || ^8.0 || ^8.1",
         "spatie/laravel-activitylog": "^3.1",
-        "laravel/laravel": "8.*||9.*"
+        "laravel/framework": "8.*||9.*"
     },
     "license": "MIT",
     "authors": [