Skip to content

Commit

Permalink
Merge branch 'main' into pr/451
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalbaljet committed Mar 20, 2024
2 parents e60f867 + af75382 commit 48cbb30
Show file tree
Hide file tree
Showing 94 changed files with 3,149 additions and 2,464 deletions.
15 changes: 8 additions & 7 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@ module.exports = {
"eslint:recommended",
"plugin:vue/vue3-recommended",
"plugin:vue/vue3-essential",
"plugin:vue/vue3-strongly-recommended"
"plugin:vue/vue3-strongly-recommended",
],
rules: {
"no-undef": 0,
"vue/multi-word-component-names": 0,
"vue/no-v-html": 0,
"vue/require-default-prop": 0,
"indent": ["error", 4],
"quotes": ["error", "double"],
"vue/no-setup-props-destructure": 0,
indent: ["error", 4],
quotes: ["error", "double"],
"object-curly-spacing": ["error", "always"],
"semi": ["error", "always"],
"comma-spacing": ["error", { "before": false, "after": true }]
}
};
semi: ["error", "always"],
"comma-spacing": ["error", { before: false, after: true }],
},
};
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.5.1
uses: dependabot/fetch-metadata@v1.6.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/fix-js-code-style-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.2
with:
ref: ${{ github.head_ref }}

- name: "Install Node"
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "${{ matrix.node-version }}"

- name: Cache node modules
id: cache-npm
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand All @@ -48,6 +48,6 @@ jobs:
run: "npm run eslint"

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Fix styling
6 changes: 3 additions & 3 deletions .github/workflows/fix-php-code-style-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.2
with:
ref: ${{ github.head_ref }}

- name: Fix PHP code style issues
uses: aglipanci/[email protected].0
uses: aglipanci/[email protected].1

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Fix styling
6 changes: 3 additions & 3 deletions .github/workflows/run-stub-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-22.04, windows-latest]
php: [8.2, 8.1]
laravel: [10.2]
php: [8.3, 8.2]
laravel: [11.0, 10.2]

name: Test Stubs ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }}

Expand All @@ -38,7 +38,7 @@ jobs:
if: matrix.os == 'windows-latest'

- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.2
with:
path: "vendor/protonemedia/laravel-splade"

Expand Down
47 changes: 25 additions & 22 deletions .github/workflows/run-table-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,23 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.2, 8.1, 8.0]
laravel: [10.*, 9.*]
php: [8.3, 8.2]
laravel: [11.0, 10.0]
db: [mysql, postgres, sqlite]
ssr: [true, false]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 9.*
testbench: 7.*
- laravel: 10.*
- laravel: 11.0
testbench: 9.*
- laravel: 10.0
testbench: 8.*
exclude:
- ssr: true
dependency-version: prefer-lowest
- ssr: true
php: 8.1
- ssr: true
php: 8.0
- laravel: 10.*
php: 8.0
- dependency-version: prefer-lowest
ssr: true
- php: 8.2
ssr: true
- laravel: 10.0
ssr: true
- db: mysql
ssr: true
- db: postgres
Expand Down Expand Up @@ -58,11 +56,11 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.2

- name: Cache node modules
id: cache-npm
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand Down Expand Up @@ -119,7 +117,12 @@ jobs:
run: |
cd app
npm upgrade
composer require laravel/framework:^${{ matrix.laravel }} --no-interaction --no-suggest
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
- name: Prepare tests
run: |
cd app
npm run build
php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
Expand Down Expand Up @@ -165,7 +168,7 @@ jobs:
- name: Execute Dusk tests (only table tests - MySQL)
if: ${{ matrix.db == 'mysql' }}
uses: nick-invision/retry@v2
uses: nick-invision/retry@v3
with:
timeout_minutes: 10
max_attempts: 3
Expand All @@ -176,7 +179,7 @@ jobs:

- name: Execute Dusk tests (only table tests - PostgreSQL)
if: ${{ matrix.db == 'postgres' }}
uses: nick-invision/retry@v2
uses: nick-invision/retry@v3
with:
timeout_minutes: 10
max_attempts: 3
Expand All @@ -187,7 +190,7 @@ jobs:

- name: Execute Dusk tests (only table tests - SQLite)
if: ${{ matrix.db == 'sqlite' }}
uses: nick-invision/retry@v2
uses: nick-invision/retry@v3
with:
timeout_minutes: 10
max_attempts: 3
Expand All @@ -196,28 +199,28 @@ jobs:

- name: Upload Screenshots
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: screenshots
path: app/tests/Browser/screenshots

- name: Upload Snapshots
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: snapshots
path: app/tests/Browser/__snapshots__

- name: Upload Console Logs
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: console
path: app/tests/Browser/console

- name: Upload Logs
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: app/storage/logs
59 changes: 38 additions & 21 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,30 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.2, 8.1, 8.0]
laravel: [10.*, 9.*]
php: [8.3, 8.2]
laravel: [11.0, 10.0]
ssr: [true, false]
dependency-version: [prefer-lowest, prefer-stable]
include:
- laravel: 9.*
testbench: 7.*
- laravel: 10.*
- laravel: 11.0
testbench: 9.*
- laravel: 10.0
testbench: 8.*
exclude:
- ssr: true
dependency-version: prefer-lowest
- ssr: true
php: 8.1
- ssr: true
php: 8.0
- laravel: 10.*
php: 8.0
php: 8.2

name: Test P${{ matrix.php }} - L${{ matrix.laravel }} - SSR ${{ matrix.ssr }} - ${{ matrix.dependency-version }}

steps:
- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.2

- name: Cache node modules
id: cache-npm
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
Expand Down Expand Up @@ -77,21 +73,42 @@ jobs:
cp public/1.jpeg storage/app/public/1.jpeg
cp public/2.jpeg storage/app/public/2.jpeg
touch database/database.sqlite
composer require laravel/framework:^${{ matrix.laravel }} --no-interaction --no-suggest
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
npm run build
php artisan storage:link
php artisan migrate:fresh --seed
- name: Prepare L10
if: ${{ matrix.laravel == '10.0' }}
run: |
cd app
rm composer.lock
composer require illuminate/contracts:^10.48.2 spatie/phpunit-snapshot-assertions:^5.0 phpunit/phpunit:^10.4 nunomaduro/collision:^7.10 --no-interaction --no-suggest
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
- name: Prepare L11
if: ${{ matrix.laravel == '11.0' }}
run: |
cd app
rm composer.lock
composer require illuminate/contracts:^11.0.1 spatie/phpunit-snapshot-assertions:^5.0 phpunit/phpunit:^10.4 nunomaduro/collision:^8.1 --no-interaction --no-suggest
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
- name: Prepare tests
run: |
cd app
npm run build
php artisan dusk:chrome-driver `/opt/google/chrome/chrome --version | cut -d " " -f3 | cut -d "." -f1`
- name: Start Chrome Driver
run: |
cd app
./vendor/laravel/dusk/bin/chromedriver-linux &
- name: Start Laravel Websockets
- name: Start Laravel Reverb
run: |
cd app
php artisan websockets:serve &
php artisan reverb:start &
- name: Start SSR server
run: |
Expand All @@ -111,37 +128,37 @@ jobs:
php artisan test
- name: Execute Dusk tests (except table tests)
uses: nick-invision/retry@v2
uses: nick-invision/retry@v3
with:
timeout_minutes: 10
max_attempts: 3
command: cd app && php artisan dusk --stop-on-error --stop-on-failure --exclude-group=table
command: cd app && php artisan dusk --stop-on-failure --stop-on-error --exclude-group=table
on_retry_command: cd app && php artisan migrate:fresh --seed

- name: Upload Screenshots
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: screenshots
path: app/tests/Browser/screenshots

- name: Upload Snapshots
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: snapshots
path: app/tests/Browser/__snapshots__

- name: Upload Console Logs
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: console
path: app/tests/Browser/console

- name: Upload Logs
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: app/storage/logs
4 changes: 2 additions & 2 deletions .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.2
with:
ref: main

Expand All @@ -21,7 +21,7 @@ jobs:
release-notes: ${{ github.event.release.body }}

- name: Commit updated CHANGELOG
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
branch: main
commit_message: Update CHANGELOG
Expand Down
Loading

0 comments on commit 48cbb30

Please sign in to comment.