diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml index f74d55f..299c290 100644 --- a/.github/workflows/laravel.yml +++ b/.github/workflows/laravel.yml @@ -7,7 +7,7 @@ on: branches: [ master ] jobs: - laravel-tests: + build: runs-on: ubuntu-latest diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..0433495 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,13 @@ +pull_request_rules: + - name: automatic merge for Dependabot pull requests + conditions: + - author=dependabot-preview[bot] + - status-success=build (macos-latest, 10) + - status-success=build (macos-latest, 12) + - status-success=build (windows-latest, 10) + - status-success=build (windows-latest, 12) + - status-success=build (ubuntu-latest, 10) + - status-success=build (ubuntu-latest, 12) + actions: + merge: + method: squash diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 33faea8..0000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: php -php: -- 7.3 -install: -- composer install -env: - global: - - DB_HOST=localhost - - DB_DATABASE=airtng - - DB_USERNAME=postgres - - APP_ENV=testing - - APP_KEY=rJhIZXkdo3FtwqdDJsC7OadHIVhnarEE - - TWILIO_ACCOUNT_SID=ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - TWILIO_AUTH_TOKEN=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - TWILIO_NUMBER=+15552737123 -before_script: - - touch database/database-test.sqlite - - php artisan migrate --database=testing --force diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 6ee2f77..dca1e03 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -31,7 +31,6 @@ class Kernel extends HttpKernel \App\Http\Middleware\EncryptCookies::class, \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Session\Middleware\StartSession::class, - // \Illuminate\Session\Middleware\AuthenticateSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, diff --git a/config/app.php b/config/app.php index a2eb60d..b5d92b0 100644 --- a/config/app.php +++ b/config/app.php @@ -113,13 +113,11 @@ /* * Laravel Framework Service Providers... */ - // Illuminate\Foundation\Providers\ArtisanServiceProvider::class, Illuminate\Auth\AuthServiceProvider::class, Illuminate\Broadcasting\BroadcastServiceProvider::class, Illuminate\Bus\BusServiceProvider::class, Illuminate\Cache\CacheServiceProvider::class, Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class, - // Illuminate\Routing\ControllerServiceProvider::class, Illuminate\Cookie\CookieServiceProvider::class, Illuminate\Database\DatabaseServiceProvider::class, Illuminate\Encryption\EncryptionServiceProvider::class, diff --git a/config/auth.php b/config/auth.php index 3fa7f49..afb0caf 100644 --- a/config/auth.php +++ b/config/auth.php @@ -69,11 +69,6 @@ 'driver' => 'eloquent', 'model' => App\User::class, ], - - // 'users' => [ - // 'driver' => 'database', - // 'table' => 'users', - // ], ], /* diff --git a/readme.md b/readme.md index aaae792..1482754 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,7 @@ # Airtng App: Part 1 - Workflow Automation with Twilio - Laravel -[![Build Status](https://travis-ci.org/TwilioDevEd/airtng-laravel.svg)](https://travis-ci.org/TwilioDevEd/airtng-laravel) +![](https://github.com/TwilioDevEd/airtng-laravel/workflows/Laravel/badge.svg) + > We are currently in the process of updating this sample template. If you are encountering any issues with the sample, please open an issue at [github.com/twilio-labs/code-exchange/issues](https://github.com/twilio-labs/code-exchange/issues) and we'll try to help you.