From 8ced3952f3a4e6f8786da5044e3f1d30aae8720e Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 18:21:51 +0000 Subject: [PATCH 01/15] Update WorkOS PHP and Laravel Versions --- .semaphore/semaphore.yml | 14 +++++++++++++- composer.json | 9 +++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index b1b24ad..cb34436 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -38,4 +38,16 @@ blocks: - name: Laravel 7-ish commands: - bash bin/restore-cache-and-update-deps 7 - - composer run-script test \ No newline at end of file + - composer run-script test + - name: Laravel 8-ish + commands: + - bash bin/restore-cache-and-update-deps 8 + - composer run-script test + - name: Laravel 9-ish + commands: + - bash bin/restore-cache-and-update-deps 9 + - composer run-script test + - name: Laravel 10-ish + commands: + - bash bin/restore-cache-and-update-deps 10 + - composer run-script test diff --git a/composer.json b/composer.json index 7a6561b..248bc4c 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "laravel 7", "laravel 8", "laravel 9", + "laravel 10", "workos", "sdk", "sso" @@ -21,12 +22,12 @@ ], "require": { "php": ">=5.6.0", - "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0", - "workos/workos-php": "^2.1.0" + "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0", + "workos/workos-php": "^v3.2.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.15 || ^3.6", - "phpunit/phpunit": "^5.7 || ^9.5.10" + "phpunit/phpunit": "^5.7 || ^9.5.10 || ^10.1" }, "suggest": { "laravel/framework": "For testing" @@ -57,4 +58,4 @@ "format-check": "php vendor/bin/php-cs-fixer fix -v --dry-run --using-cache=no .", "test": "php vendor/bin/phpunit tests" } -} +} \ No newline at end of file From fb09f5e23169da7ac7fe64d9566ce4bbee6920ef Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 18:27:20 +0000 Subject: [PATCH 02/15] update dependency bash script --- bin/restore-cache-and-update-deps | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index ffbe7f9..1e6d780 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -21,9 +21,24 @@ case ${1} in echo "7...ish" laravel_version="^7.5" ;; + + "8") + echo "8...ish" + laravel_version="^8.83" + ;; + + "9") + echo "9...ish" + laravel_version="^9.52" + ;; + + "10") + echo "10...ish" + laravel_version="^10.8" + ;; *) - printf "\nError: Specify either 5, 6 or 7 for Laravel version\n" + printf "\nError: Specify either 5, 6, 7, 8, 9, or 10 for Laravel version\n" exit 1 ;; esac From f884fa9d95578349204e955a18b5f9298a06910b Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 18:32:53 +0000 Subject: [PATCH 03/15] add composer update to semaphore test --- .semaphore/semaphore.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index cb34436..9c37baf 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -46,6 +46,7 @@ blocks: - name: Laravel 9-ish commands: - bash bin/restore-cache-and-update-deps 9 + - composer update - composer run-script test - name: Laravel 10-ish commands: From 3e2118e512bf87cad677d88af6294340f0035353 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 18:35:39 +0000 Subject: [PATCH 04/15] Add composer dump and install commands to semaphore --- .semaphore/semaphore.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 9c37baf..8abe035 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -46,6 +46,8 @@ blocks: - name: Laravel 9-ish commands: - bash bin/restore-cache-and-update-deps 9 + - composer dump-autoload + - composer install --no-scripts - composer update - composer run-script test - name: Laravel 10-ish From 727423cfdddc29cd012555711fab6273173e2fe3 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 18:53:19 +0000 Subject: [PATCH 05/15] Update PHP version used with semaphore --- .semaphore/semaphore.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 8abe035..2cdec16 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -45,6 +45,8 @@ blocks: - composer run-script test - name: Laravel 9-ish commands: + - phpbrew --no-progress install 8.0.7 + - phpbrew use php-8.0.7 - bash bin/restore-cache-and-update-deps 9 - composer dump-autoload - composer install --no-scripts From d250641b3fa4b9021a1b753135188f3aa73a1374 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 19:07:46 +0000 Subject: [PATCH 06/15] Remove Extra Composer Commands --- .semaphore/semaphore.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 2cdec16..51afb33 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -48,9 +48,6 @@ blocks: - phpbrew --no-progress install 8.0.7 - phpbrew use php-8.0.7 - bash bin/restore-cache-and-update-deps 9 - - composer dump-autoload - - composer install --no-scripts - - composer update - composer run-script test - name: Laravel 10-ish commands: From 426b522173632c09657d9a9d149033b698b66188 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 19:28:35 +0000 Subject: [PATCH 07/15] Update Laravel 9 Composer Command --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 51afb33..47962e4 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -48,7 +48,7 @@ blocks: - phpbrew --no-progress install 8.0.7 - phpbrew use php-8.0.7 - bash bin/restore-cache-and-update-deps 9 - - composer run-script test + - php composer.phar run-script test - name: Laravel 10-ish commands: - bash bin/restore-cache-and-update-deps 10 From 0e7a9816847930e91833622be83a6558908299ab Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 19:40:43 +0000 Subject: [PATCH 08/15] Install Composer in Semaphore --- .semaphore/semaphore.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 47962e4..896faae 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -48,7 +48,8 @@ blocks: - phpbrew --no-progress install 8.0.7 - phpbrew use php-8.0.7 - bash bin/restore-cache-and-update-deps 9 - - php composer.phar run-script test + - apt install composer + - composer run-script test - name: Laravel 10-ish commands: - bash bin/restore-cache-and-update-deps 10 From 03b2b2d997621f747e0fb94e3f18b3985f63ef0f Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 19:53:46 +0000 Subject: [PATCH 09/15] Only update WorkOS PHP Dependency --- .semaphore/semaphore.yml | 11 ----------- composer.json | 5 ++--- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 896faae..a7d5587 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -43,14 +43,3 @@ blocks: commands: - bash bin/restore-cache-and-update-deps 8 - composer run-script test - - name: Laravel 9-ish - commands: - - phpbrew --no-progress install 8.0.7 - - phpbrew use php-8.0.7 - - bash bin/restore-cache-and-update-deps 9 - - apt install composer - - composer run-script test - - name: Laravel 10-ish - commands: - - bash bin/restore-cache-and-update-deps 10 - - composer run-script test diff --git a/composer.json b/composer.json index 248bc4c..2f1cf00 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,6 @@ "laravel 7", "laravel 8", "laravel 9", - "laravel 10", "workos", "sdk", "sso" @@ -22,12 +21,12 @@ ], "require": { "php": ">=5.6.0", - "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0", + "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0", "workos/workos-php": "^v3.2.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.15 || ^3.6", - "phpunit/phpunit": "^5.7 || ^9.5.10 || ^10.1" + "phpunit/phpunit": "^5.7 || ^9.5.10" }, "suggest": { "laravel/framework": "For testing" From 3361ef19f0104edaa426c3cffd4879db1e88ac1e Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 19:54:28 +0000 Subject: [PATCH 10/15] Update bash script to remove Laravel 9 and 10 --- bin/restore-cache-and-update-deps | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 1e6d780..7fd8bbd 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -26,16 +26,6 @@ case ${1} in echo "8...ish" laravel_version="^8.83" ;; - - "9") - echo "9...ish" - laravel_version="^9.52" - ;; - - "10") - echo "10...ish" - laravel_version="^10.8" - ;; *) printf "\nError: Specify either 5, 6, 7, 8, 9, or 10 for Laravel version\n" From 66b30db48dfcfe3c22ece4fbfcdab0cbb0834956 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 19:55:34 +0000 Subject: [PATCH 11/15] Update bash script remove Laravel versions 9 and 10 --- bin/restore-cache-and-update-deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 7fd8bbd..46cb5d4 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -28,7 +28,7 @@ case ${1} in ;; *) - printf "\nError: Specify either 5, 6, 7, 8, 9, or 10 for Laravel version\n" + printf "\nError: Specify either 5, 6, 7, 8 for Laravel version\n" exit 1 ;; esac From ba59364da303e0e1f1e26ef96b73f77355be6373 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 20:02:08 +0000 Subject: [PATCH 12/15] Remove Laravel 8 --- .semaphore/semaphore.yml | 4 ---- bin/restore-cache-and-update-deps | 7 +------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index a7d5587..7c90752 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -39,7 +39,3 @@ blocks: commands: - bash bin/restore-cache-and-update-deps 7 - composer run-script test - - name: Laravel 8-ish - commands: - - bash bin/restore-cache-and-update-deps 8 - - composer run-script test diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 46cb5d4..67d762a 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -21,14 +21,9 @@ case ${1} in echo "7...ish" laravel_version="^7.5" ;; - - "8") - echo "8...ish" - laravel_version="^8.83" - ;; *) - printf "\nError: Specify either 5, 6, 7, 8 for Laravel version\n" + printf "\nError: Specify either 5, 6, 7 for Laravel version\n" exit 1 ;; esac From 746f722863b0415892cc4d9ba3ab9df3c4602446 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 20:03:06 +0000 Subject: [PATCH 13/15] fix typo in bash script --- bin/restore-cache-and-update-deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 67d762a..5cad1f3 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -23,7 +23,7 @@ case ${1} in ;; *) - printf "\nError: Specify either 5, 6, 7 for Laravel version\n" + printf "\nError: Specify either 5, 6, or 7 for Laravel version\n" exit 1 ;; esac From 69f93b0cc5632bde4c78fa9d84206283113ed2d5 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 23:29:07 +0000 Subject: [PATCH 14/15] fix whitespace --- bin/restore-cache-and-update-deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index 5cad1f3..e0d4500 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -33,4 +33,4 @@ composer require laravel/framework=${laravel_version} composer u echo "Attempt to store cache in case of an initial miss" -cache store $KEY ./vendor \ No newline at end of file +cache store $KEY ./vendor From 9d03ded6b2eda1db7ce4d25cd34630bf4cbde3f6 Mon Sep 17 00:00:00 2001 From: Sheldon Vaughn Date: Thu, 20 Apr 2023 23:31:21 +0000 Subject: [PATCH 15/15] fix whitespace --- bin/restore-cache-and-update-deps | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/restore-cache-and-update-deps b/bin/restore-cache-and-update-deps index e0d4500..c488c9f 100755 --- a/bin/restore-cache-and-update-deps +++ b/bin/restore-cache-and-update-deps @@ -34,3 +34,4 @@ composer u echo "Attempt to store cache in case of an initial miss" cache store $KEY ./vendor + diff --git a/composer.json b/composer.json index 2f1cf00..31d704c 100644 --- a/composer.json +++ b/composer.json @@ -57,4 +57,4 @@ "format-check": "php vendor/bin/php-cs-fixer fix -v --dry-run --using-cache=no .", "test": "php vendor/bin/phpunit tests" } -} \ No newline at end of file +}