From 0d73d63c80d6df85c943e15117dcf9829d08a016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josip=20Crnkovi=C4=87?= <6536260+crnkovic@users.noreply.github.com> Date: Fri, 13 Jan 2023 12:44:51 +0100 Subject: [PATCH 1/5] wip --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/compress.yml | 2 +- .github/workflows/deps.yml | 8 ++++---- .github/workflows/format.yml | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3849d897..4ce7d944b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,13 +14,13 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} - name: Merge Conflict finder - uses: olivernybroe/action-conflict-finder@v1.1 + uses: olivernybroe/action-conflict-finder@v4 unit: needs: [conflicts] @@ -40,7 +40,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} @@ -53,7 +53,7 @@ jobs: coverage: pcov - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.composer/cache/files key: dependencies-composer-${{ hashFiles('composer.json') }} diff --git a/.github/workflows/compress.yml b/.github/workflows/compress.yml index 5d1dba5ae..f5614f9d8 100644 --- a/.github/workflows/compress.yml +++ b/.github/workflows/compress.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml index 4497c9a55..39b267ca8 100644 --- a/.github/workflows/deps.yml +++ b/.github/workflows/deps.yml @@ -9,7 +9,7 @@ jobs: php: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} @@ -32,7 +32,7 @@ jobs: - name: Create Pull Request id: cpr - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GH_TOKEN }} commit-message: "chore: update PHP dependencies" @@ -46,7 +46,7 @@ jobs: js: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} @@ -72,7 +72,7 @@ jobs: - name: Create Pull Request id: cpr - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GH_TOKEN }} commit-message: "chore: update JavaScript dependencies" diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index f75bc8650..21aa32ed7 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} @@ -85,7 +85,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} From 3b9e9eb23c016de030bbe0f80969082b6c4bd827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josip=20Crnkovi=C4=87?= <6536260+crnkovic@users.noreply.github.com> Date: Fri, 13 Jan 2023 12:46:05 +0100 Subject: [PATCH 2/5] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ce7d944b..5ae97244b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: token: ${{ secrets.GH_TOKEN }} - name: Merge Conflict finder - uses: olivernybroe/action-conflict-finder@v4 + uses: olivernybroe/action-conflict-finder@v4.0 unit: needs: [conflicts] From c4f36d6b6dc21c19913df0d61215b8f877cbcdf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josip=20Crnkovi=C4=87?= <6536260+crnkovic@users.noreply.github.com> Date: Fri, 13 Jan 2023 12:58:10 +0100 Subject: [PATCH 3/5] update stubs --- stubs/.github/workflows/ci.yml | 8 ++++---- stubs/.github/workflows/compress.yml | 2 +- stubs/.github/workflows/deps.yml | 2 +- stubs/.github/workflows/format.yml | 10 +++++----- stubs/.github/workflows/static.yml | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/stubs/.github/workflows/ci.yml b/stubs/.github/workflows/ci.yml index a1e044de8..c331c3080 100644 --- a/stubs/.github/workflows/ci.yml +++ b/stubs/.github/workflows/ci.yml @@ -14,12 +14,12 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} - name: Merge Conflict finder - uses: olivernybroe/action-conflict-finder@v1.1 + uses: olivernybroe/action-conflict-finder@v4.0 unit: needs: [conflicts] @@ -28,7 +28,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} @@ -40,7 +40,7 @@ jobs: coverage: pcov - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.composer/cache/files key: dependencies-composer-${{ hashFiles('composer.json') }} diff --git a/stubs/.github/workflows/compress.yml b/stubs/.github/workflows/compress.yml index 5d1dba5ae..f5614f9d8 100644 --- a/stubs/.github/workflows/compress.yml +++ b/stubs/.github/workflows/compress.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} diff --git a/stubs/.github/workflows/deps.yml b/stubs/.github/workflows/deps.yml index 609a96929..69bfc0124 100644 --- a/stubs/.github/workflows/deps.yml +++ b/stubs/.github/workflows/deps.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} diff --git a/stubs/.github/workflows/format.yml b/stubs/.github/workflows/format.yml index 1ad8767eb..fbc999096 100644 --- a/stubs/.github/workflows/format.yml +++ b/stubs/.github/workflows/format.yml @@ -13,14 +13,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: "8.0" + php-version: "8.1" extensions: mbstring, dom, fileinfo, intl, gd, imagick, bcmath, soap, zip, sqlite, pcov coverage: pcov @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} @@ -60,7 +60,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} @@ -80,7 +80,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} token: ${{ secrets.GH_TOKEN }} diff --git a/stubs/.github/workflows/static.yml b/stubs/.github/workflows/static.yml index d4cb751b9..c6bccca41 100644 --- a/stubs/.github/workflows/static.yml +++ b/stubs/.github/workflows/static.yml @@ -14,17 +14,17 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: "8.0" + php-version: "8.1" extensions: mbstring, dom, fileinfo, intl, gd, imagick, bcmath, soap, zip, sqlite, pcov coverage: pcov - name: Cache dependencies - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.composer/cache/files key: dependencies-composer-${{ hashFiles('composer.json') }} From ddbd53518fca10db0f9bb6855da3b3758086b754 Mon Sep 17 00:00:00 2001 From: ItsANameToo Date: Fri, 13 Jan 2023 13:59:59 +0100 Subject: [PATCH 4/5] chore: force workflow and recommit --- config/fortify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/fortify.php b/config/fortify.php index 2303f6270..732c750ae 100644 --- a/config/fortify.php +++ b/config/fortify.php @@ -155,7 +155,7 @@ |-------------------------------------------------------------------------- */ - 'mail' => [ + 'mail' => [ 'default' => [ 'name' => env('MAIL_DEFAULT_NAME', 'ARK Ecosystem'), 'address' => env('MAIL_DEFAULT_ADDRESS', 'noreply@ark.io'), From 0945f265e0608d2f44e24a37b83245f0feb8a793 Mon Sep 17 00:00:00 2001 From: ItsANameToo Date: Fri, 13 Jan 2023 13:00:59 +0000 Subject: [PATCH 5/5] style: resolve style guide violations --- config/fortify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/fortify.php b/config/fortify.php index 732c750ae..2303f6270 100644 --- a/config/fortify.php +++ b/config/fortify.php @@ -155,7 +155,7 @@ |-------------------------------------------------------------------------- */ - 'mail' => [ + 'mail' => [ 'default' => [ 'name' => env('MAIL_DEFAULT_NAME', 'ARK Ecosystem'), 'address' => env('MAIL_DEFAULT_ADDRESS', 'noreply@ark.io'),