From 54ad94abe2f6f4536b27b7cd79788977959de1ff Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Tue, 16 Jul 2024 11:31:05 +0200 Subject: [PATCH 1/2] Update GitHub checkout action to v4 --- .github/workflows/fix-cs.yml | 2 +- .github/workflows/run-integration-tests.yml | 4 ++-- .github/workflows/run-tests.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fix-cs.yml b/.github/workflows/fix-cs.yml index ac92f4dd..e097d720 100644 --- a/.github/workflows/fix-cs.yml +++ b/.github/workflows/fix-cs.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml index d89713e9..ac90ce60 100644 --- a/.github/workflows/run-integration-tests.yml +++ b/.github/workflows/run-integration-tests.yml @@ -26,7 +26,7 @@ jobs: name: P${{ matrix.php }} - Lumen${{ matrix.lumen }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: src @@ -78,7 +78,7 @@ jobs: name: P${{ matrix.php }} - Laravel${{ matrix.laravel }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: src diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8c8f4aa1..d3637303 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -35,7 +35,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 From 0e44635aeb531b4436d0c1f97ec70b65ffb70312 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Tue, 16 Jul 2024 11:31:54 +0200 Subject: [PATCH 2/2] Run CI codestyle fixes on PRs rather than master Also bump stefanzweifel/git-auto-commit-action to v5 --- .github/workflows/fix-cs.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/fix-cs.yml b/.github/workflows/fix-cs.yml index e097d720..561325e8 100644 --- a/.github/workflows/fix-cs.yml +++ b/.github/workflows/fix-cs.yml @@ -1,9 +1,9 @@ name: Fix Code Style on: - push: + pull_request: branches: - - master + - "*" permissions: contents: write @@ -19,6 +19,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -37,7 +39,7 @@ jobs: # Revert modifications so they don't get committed 💥 - run: git checkout -- composer.json - - uses: stefanzweifel/git-auto-commit-action@v4 + - uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: composer fix-style commit_author: laravel-debugbar