Skip to content

Commit

Permalink
Merge branch '8.x' into 9.x
Browse files Browse the repository at this point in the history
Signed-off-by: Mior Muhammad Zaki <[email protected]>
  • Loading branch information
crynobone committed Nov 7, 2023
2 parents aec2c29 + f6294c7 commit 2c1ad1d
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 54 deletions.
48 changes: 0 additions & 48 deletions .github/workflows/test-on-windows.yaml

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
matrix:
os:
- "ubuntu-latest"
- "windows-latest"
php:
- 8.2
- 8.3
Expand All @@ -22,7 +23,7 @@ jobs:
experimental:
- false

name: PHP${{ matrix.php }}-${{ matrix.os }} (${{ matrix.dependencies }})
name: PHP${{ matrix.php }} on ${{ matrix.os }} (${{ matrix.dependencies }})

steps:
- name: Checkout code
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG-1.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

This changelog references the relevant changes (bug and security fixes) done to `orchestra/workbench`.

## 1.0.1

Released: 2023-10-31

### Added

* Added Workbench information to `about` artisan command.

### Changes

* Disable Composer script timeout to `composer run serve` generator.

## 1.0.0

Released: 2023-10-24
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG-7.x.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Changes for 7.x

This changelog references the relevant changes (bug and security fixes) done to `orchestra/workbench`.

## 7.0.0

Released: 2023-11-07

### Changes

Restructure releases for Workbench to follow Testbench version. `7.x` releases will only be compatible with Testbench `7.x` and Laravel `9.x`.
11 changes: 11 additions & 0 deletions CHANGELOG-8.x.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Changes for 8.x

This changelog references the relevant changes (bug and security fixes) done to `orchestra/workbench`.

## 8.0.0

Released: 2023-11-07

### Changes

Restructure releases for Workbench to follow Testbench version. `8.x` releases will only be compatible with Testbench `8.x` and Laravel `10.x`.
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@
"php": "^8.1",
"composer-runtime-api": "^2.2",
"fakerphp/faker": "^1.21",
"laravel/framework": "^10.26 || ^11.0",
"laravel/framework": "^11.0",
"laravel/tinker": "dev-develop",
"orchestra/canvas": "^8.11 || ^9.0",
"orchestra/testbench-core": "^8.14 || ^9.0",
"symfony/yaml": "^6.2 || ^7.0"
"orchestra/canvas": "^9.0",
"orchestra/testbench-core": "^9.0",
"symfony/yaml": "^7.0"
},
"require-dev": {
"laravel/pint": "^1.4",
"mockery/mockery": "^1.5.1",
"phpstan/phpstan": "^1.10.7",
"phpunit/phpunit": "^10.4",
"symfony/process": "^6.2 || ^7.0"
"symfony/process": "^7.0"
},
"extra": {
"branch-alias": {
Expand Down

0 comments on commit 2c1ad1d

Please sign in to comment.