From 88156176684f921ccdc3a5d637aa54ee060a040f Mon Sep 17 00:00:00 2001 From: Christopher Gammie Date: Sun, 11 Jun 2023 15:04:49 +0100 Subject: [PATCH 1/3] build: add branch alias and update tests for 3.x branch --- .github/workflows/tests.yml | 4 ++-- composer.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2eb4493..a3847b0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,9 +2,9 @@ name: Tests on: push: - branches: [ main, develop ] + branches: [ main, develop, 3.x ] pull_request: - branches: [ main, develop ] + branches: [ main, develop, 3.x ] jobs: build: diff --git a/composer.json b/composer.json index 3c662b4..74e86ba 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,8 @@ }, "extra": { "branch-alias": { - "dev-develop": "2.x-dev" + "dev-develop": "2.x-dev", + "dev-3.x": "3.x-dev" } }, "minimum-stability": "stable", From bcfc7621d9fcce559d9fdd144a3c8633027313fd Mon Sep 17 00:00:00 2001 From: Christopher Gammie Date: Sun, 11 Jun 2023 15:05:41 +0100 Subject: [PATCH 2/3] build(deps): update core and validation dependencies --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 74e86ba..41956bd 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,8 @@ "ext-json": "*", "illuminate/contracts": "^10.0", "illuminate/pipeline": "^10.0", - "laravel-json-api/core": "^3.0", - "laravel-json-api/validation": "^3.0" + "laravel-json-api/core": "^4.0", + "laravel-json-api/validation": "^4.0" }, "require-dev": { "laravel-json-api/testing": "^2.0", @@ -51,7 +51,7 @@ "dev-3.x": "3.x-dev" } }, - "minimum-stability": "stable", + "minimum-stability": "dev", "prefer-stable": true, "config": { "sort-packages": true From d42d024b97b6acf6baab17f5381025d34b3c21ed Mon Sep 17 00:00:00 2001 From: Christopher Gammie Date: Thu, 8 Feb 2024 18:17:30 +0000 Subject: [PATCH 3/3] build: updates to rename branch to next --- .github/workflows/tests.yml | 4 ++-- composer.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a3847b0..08ca968 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,9 +2,9 @@ name: Tests on: push: - branches: [ main, develop, 3.x ] + branches: [ main, develop, next ] pull_request: - branches: [ main, develop, 3.x ] + branches: [ main, develop, next ] jobs: build: diff --git a/composer.json b/composer.json index 41956bd..ab80f18 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,8 @@ "ext-json": "*", "illuminate/contracts": "^10.0", "illuminate/pipeline": "^10.0", - "laravel-json-api/core": "^4.0", - "laravel-json-api/validation": "^4.0" + "laravel-json-api/core": "^5.0", + "laravel-json-api/validation": "^5.0" }, "require-dev": { "laravel-json-api/testing": "^2.0", @@ -48,7 +48,7 @@ "extra": { "branch-alias": { "dev-develop": "2.x-dev", - "dev-3.x": "3.x-dev" + "dev-next": "4.x-dev" } }, "minimum-stability": "dev",