From df81af3e6a3e9feb1e30f4a198f2d4653f08a712 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Tue, 16 Jul 2024 14:50:42 +0200 Subject: [PATCH 1/3] Revert "Use self version constraints" This reverts commit 2412afc2219a347a08f0b8fceab36ef9dea4cc41. --- composer.json | 12 ++++++------ composer.lock | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 8d151bc6b72..6a9b39dd542 100644 --- a/composer.json +++ b/composer.json @@ -16,17 +16,17 @@ ], "require": { "php": "^8.1", - "hyde/framework": "self.version", - "hyde/publications": "self.version", - "hyde/ui-kit": "self.version", + "hyde/framework": "dev-master", + "hyde/publications": "dev-master", + "hyde/ui-kit": "dev-master", "laravel-zero/framework": "^10.0" }, "require-dev": { "desilva/psalm-coverage": "dev-master", "driftingly/rector-laravel": "^0.14.1", - "hyde/monorepo-dev-tools": "self.version", - "hyde/realtime-compiler": "self.version", - "hyde/testing": "self.version", + "hyde/monorepo-dev-tools": "dev-master", + "hyde/realtime-compiler": "dev-master", + "hyde/testing": "dev-master", "jetbrains/phpstorm-attributes": "^1.0", "laravel/tinker": "^2.7", "pestphp/pest-plugin-type-coverage": "^2.8", diff --git a/composer.lock b/composer.lock index 38ac2a706ce..42f8d1a4201 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5cbdcdc52f721cf6ecdcde7ee9f23037", + "content-hash": "6989c7336f28a584261e8b5c658baeb4", "packages": [ { "name": "brick/math", From 92394a4906dcf3d570cec1fe1298a99983a4536a Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Tue, 16 Jul 2024 14:50:47 +0200 Subject: [PATCH 2/3] Reapply "Update to require any junctioned package version" This reverts commit 605fab48436c02d0d90c370f7ca6d3461ec4d29b. --- composer.json | 12 ++++++------ composer.lock | 10 ++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 6a9b39dd542..e11c65546f7 100644 --- a/composer.json +++ b/composer.json @@ -16,17 +16,17 @@ ], "require": { "php": "^8.1", - "hyde/framework": "dev-master", - "hyde/publications": "dev-master", - "hyde/ui-kit": "dev-master", + "hyde/framework": "*", + "hyde/publications": "*", + "hyde/ui-kit": "*", "laravel-zero/framework": "^10.0" }, "require-dev": { "desilva/psalm-coverage": "dev-master", "driftingly/rector-laravel": "^0.14.1", - "hyde/monorepo-dev-tools": "dev-master", - "hyde/realtime-compiler": "dev-master", - "hyde/testing": "dev-master", + "hyde/monorepo-dev-tools": "*", + "hyde/realtime-compiler": "*", + "hyde/testing": "*", "jetbrains/phpstorm-attributes": "^1.0", "laravel/tinker": "^2.7", "pestphp/pest-plugin-type-coverage": "^2.8", diff --git a/composer.lock b/composer.lock index 42f8d1a4201..390143a7e52 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6989c7336f28a584261e8b5c658baeb4", + "content-hash": "b5b00b328408d10137d87a733894c5ec", "packages": [ { "name": "brick/math", @@ -11154,13 +11154,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "hyde/framework": 20, - "hyde/publications": 20, - "hyde/ui-kit": 20, - "desilva/psalm-coverage": 20, - "hyde/monorepo-dev-tools": 20, - "hyde/realtime-compiler": 20, - "hyde/testing": 20 + "desilva/psalm-coverage": 20 }, "prefer-stable": true, "prefer-lowest": false, From 8c806a9e969484846de48113f8c72776c1fcba8c Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Tue, 16 Jul 2024 14:56:06 +0200 Subject: [PATCH 3/3] Disable unbound version check for the monorepo Composer file --- .github/workflows/continuous-integration.yml | 2 +- .github/workflows/smoke-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 398133ebc00..8604b098b53 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v4 - name: Validate composer.json and composer.lock - run: composer validate --strict + run: composer validate --strict --no-check-all - name: Cache Composer packages id: composer-cache diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 21ce92b5419..fb45f5e146e 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Validate composer.json and composer.lock - run: composer validate --strict + run: composer validate --strict --no-check-all - name: Cache Composer packages id: composer-cache