From 201f16610dd4d7db792186c16f72ef11b1c769ff Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Thu, 2 Feb 2023 11:21:52 +0000 Subject: [PATCH 1/5] Fix an unconstrained CI require for spatie/laravel-ignition that was trying to install ^2.0 series --- .github/workflows/continuous-integration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 18797b78..a327424c 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -405,7 +405,8 @@ jobs: run: "composer require laravel/framework:${{ matrix.laravel-version}} --no-update --no-interaction --prefer-dist --prefer-stable" - name: "Install spatie/laravel-ignition (if available)" if: ${{ (matrix.php-version == '8.0' || matrix.php-version == '8.1') && (matrix.laravel-version == '8.*' || matrix.laravel-version == '9.*') }} - run: "composer require --dev spatie/laravel-ignition --no-update --no-interaction" + # Note: for Laravel 10, we will need to use `spatie/laravel-ignition:^2.0` + run: "composer require --dev spatie/laravel-ignition:^1.6 --no-update --no-interaction" - name: "Unrestrict nesbot/carbon for older PHP versions" if: ${{ (matrix.php-version == '7.2' || matrix.php-version == '7.3' || matrix.php-version == '7.4' || matrix.php-version == '8.0' || matrix.php-version == '8.1') }} run: "composer remove --dev --no-update --no-interaction nesbot/carbon" From 9c415b66923453811b0ac95cb554039ed6a16563 Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Thu, 2 Feb 2023 11:38:32 +0000 Subject: [PATCH 2/5] Updated to vampire/setup-wsl@v2 - fixes #300 --- .github/workflows/continuous-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a327424c..aa210d79 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -115,7 +115,7 @@ jobs: SCOUT_APM_KEY: ${{ secrets.SCOUT_APM_KEY }} steps: - uses: actions/checkout@v3 - - uses: Vampire/setup-wsl@v1 + - uses: Vampire/setup-wsl@v2 if: ${{ matrix.os == 'windows-latest' }} - name: "Install PHP" uses: shivammathur/setup-php@v2 From d084f2cca5713e15796f69f43930d6c378e5783a Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Thu, 2 Feb 2023 11:51:00 +0000 Subject: [PATCH 3/5] Update distribution to update WSL certs to avoid error about self-signed cert from errors.scoutapm.com --- .github/workflows/continuous-integration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index aa210d79..6edeb0ed 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -117,6 +117,8 @@ jobs: - uses: actions/checkout@v3 - uses: Vampire/setup-wsl@v2 if: ${{ matrix.os == 'windows-latest' }} + with: + update: 'true' - name: "Install PHP" uses: shivammathur/setup-php@v2 with: From 99da1719126d68212fb546aac424a3bfe01f48aa Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Thu, 2 Feb 2023 12:06:09 +0000 Subject: [PATCH 4/5] Add step to update-ca-certs --- .github/workflows/continuous-integration.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 6edeb0ed..3649ab67 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -119,6 +119,11 @@ jobs: if: ${{ matrix.os == 'windows-latest' }} with: update: 'true' + - name: "Update CA certificates" + shell: wsl-bash {0} + run: | + apt-get update && apt-get install -y ca-certificates + update-ca-certificates - name: "Install PHP" uses: shivammathur/setup-php@v2 with: From 16d265688085569aec5f126521754952eba17917 Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Thu, 2 Feb 2023 14:45:05 +0000 Subject: [PATCH 5/5] Revert requiring CA updates --- .github/workflows/continuous-integration.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 3649ab67..aa210d79 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -117,13 +117,6 @@ jobs: - uses: actions/checkout@v3 - uses: Vampire/setup-wsl@v2 if: ${{ matrix.os == 'windows-latest' }} - with: - update: 'true' - - name: "Update CA certificates" - shell: wsl-bash {0} - run: | - apt-get update && apt-get install -y ca-certificates - update-ca-certificates - name: "Install PHP" uses: shivammathur/setup-php@v2 with: