Fix CI issues checking out old commits (#467)

The used `github.event.pull_request.merge_commit_sha` seems to be broken and has the old commit always. Instead we try now use the `github.event.pull_request.head.sha`. This is required because we use secrets and need so use `pull_request_target` instead of `pull_request` event which behaves differently.
PHP-CMSIG · Dec 27, 2024 · 6b55f82 · 6b55f82
1 parent 7f4ae32
commit 6b55f82
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/callable-test.yml b/.github/workflows/callable-test.yml
@@ -31,9 +31,6 @@ jobs:
                       dependency-versions: 'highest'
 
         steps:
-            - name: Wait for 5 seconds
-              run: sleep 5
-
             - name: Output infos
               run: |
                   echo "${{ github.event.pull_request.merge_commit_sha }}"
@@ -42,7 +39,7 @@ jobs:
             - name: Checkout project
               uses: actions/checkout@v4
               with:
-                  ref: "${{ github.event.pull_request.merge_commit_sha }}"
+                  ref: "${{ github.event.pull_request.head.sha }}"
 
             - name: Git infos
               run: |

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -13,12 +13,20 @@ jobs:
     docs:
         runs-on: ubuntu-latest
         steps:
-            - name: Wait for 5 seconds
-              run: sleep 5
+            - name: Output infos
+              run: |
+                  echo "${{ github.event.pull_request.merge_commit_sha }}"
+                  echo "${{ github.event.pull_request.head.sha }}"
 
-            - uses: actions/checkout@v4
+            - name: Checkout project
+              uses: actions/checkout@v4
               with:
-                  ref: "${{ github.event.pull_request.merge_commit_sha }}"
+                  ref: "${{ github.event.pull_request.head.sha }}"
+
+            - name: Git infos
+              run: |
+                  git rev-parse HEAD
+                  git branch --show-current
 
             - uses: actions/setup-python@v5
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,13 +12,20 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - name: Wait for 5 seconds
-              run: sleep 5
+            - name: Output infos
+              run: |
+                  echo "${{ github.event.pull_request.merge_commit_sha }}"
+                  echo "${{ github.event.pull_request.head.sha }}"
 
             - name: Checkout project
               uses: actions/checkout@v4
               with:
-                  ref: "${{ github.event.pull_request.merge_commit_sha }}"
+                  ref: "${{ github.event.pull_request.head.sha }}"
+
+            - name: Git infos
+              run: |
+                  git rev-parse HEAD
+                  git branch --show-current
 
             - name: Install and configure PHP
               uses: shivammathur/setup-php@v2

diff --git a/integrations/spiral/src/Console/ReindexCommand.php b/integrations/spiral/src/Console/ReindexCommand.php
@@ -61,9 +61,9 @@ public function __invoke(
         EngineRegistry $engineRegistry,
     ): int {
         /** @var \DateTimeImmutable|null $dateTimeBoundary */
-        $dateTimeBoundary = $this->datetimeBoundary ? new \DateTimeImmutable((string) $this->datetimeBoundary) : null;
+        $dateTimeBoundary = $this->datetimeBoundary ? new \DateTimeImmutable((string) $this->datetimeBoundary) : null; // @phpstan-ignore-line
         /** @var array<string> $identifiers */
-        $identifiers = \array_filter(\explode(',', (string) $this->identifiers));
+        $identifiers = \array_filter(\explode(',', (string) $this->identifiers)); // @phpstan-ignore-line
 
         $reindexConfig = ReindexConfig::create()
             ->withIndex($this->indexName)