Skip to content

Commit

Permalink
Merge branch 'main' into feature/moving_payments_migrations_models_fa…
Browse files Browse the repository at this point in the history
…ctories_to_package
  • Loading branch information
drewroberts authored Feb 5, 2021
2 parents a6ae44c + c49b3e7 commit 7c77d31
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
18 changes: 16 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.0, 7.4]
Expand All @@ -28,12 +28,26 @@ jobs:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
coverage: none

- name: Setup problem matchers
run: |
echo "::add-matcher::${{ runner.tool_cache }}/php.json"
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
- if: matrix.os == 'ubuntu-latest'
name: Setup Ubuntu Nova
env:
NOVA_USERNAME: ${{ secrets.NovaUsername }}
NOVA_PASSWORD: ${{ secrets.NovaPassword }}
run: composer config http-basic.nova.laravel.com ${NOVA_USERNAME} ${NOVA_PASSWORD}

- if: matrix.os == 'windows-latest'
name: Setup Windows Nova
env:
NOVA_USERNAME: ${{ secrets.NovaUsername }}
NOVA_PASSWORD: ${{ secrets.NovaPassword }}
run: composer config http-basic.nova.laravel.com ${env:NOVA_USERNAME} ${env:NOVA_PASSWORD}

- name: Install dependencies
env:
NOVA_USERNAME: ${{ secrets.NovaUsername }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
**/.DS_Store
.idea
.php_cs
.php_cs.cache
Expand Down
2 changes: 0 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
],
"require": {
"php": "^7.4|^8.0",
"spatie/laravel-package-tools": "^1.1",
"illuminate/contracts": "^8.0",
"tipoff/support": "^1.0"
},
"require-dev": {
Expand Down

0 comments on commit 7c77d31

Please sign in to comment.