Skip to content

Commit ae70e9f

Browse files
Sander Mullerclaude
authored andcommitted
Group the atomic-save e2e entry with the other result-cache ones
It went in as the first entry of the matrix, which is the position every branch reaches for. An entry there has to be reconciled on every merge of 2.2.x into 2.3.x, and 2.3.x is where the single-pass work will be adding its own scenarios. Moved next to result-cache-10, where its siblings are. Pure move: the matrix holds the same 70 scripts before and after, compared as a set, and the scenario still passes. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
1 parent e7757dc commit ae70e9f

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

‎.github/workflows/e2e-tests.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,6 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
include:
37-
- script: |
38-
cd e2e/result-cache-atomic-save
39-
../../bin/phpstan
40-
INODE=$(ls -i tmp/resultCache.php | awk '{print $1}')
41-
../../bin/phpstan
42-
# The cache is written next to its final path and renamed into place, so saving it
43-
# again replaces the file rather than truncating and rewriting the one the next run
44-
# reads. That is what keeps a run killed mid-save from leaving a partial cache behind.
45-
REPLACED=$([ "$INODE" != "$(ls -i tmp/resultCache.php | awk '{print $1}')" ] && echo replaced || echo 'written in place')
46-
../bashunit -a equals 'replaced' "$REPLACED"
47-
# A completed save leaves nothing next to the cache file.
48-
LEFTOVERS=$(ls tmp/ | grep -c '\.tmp$' || true)
49-
../bashunit -a equals '0' "$LEFTOVERS"
50-
OUTPUT=$(../../bin/phpstan -vvv 2>&1)
51-
echo "$OUTPUT"
52-
../bashunit -a contains 'Result cache restored. 0 files will be reanalysed.' "$OUTPUT"
5337
- script: |
5438
cd e2e/result-cache-1
5539
echo -n > phpstan-baseline.neon
@@ -140,6 +124,22 @@ jobs:
140124
mv src/Foo.php.orig src/Foo.php
141125
echo -n > phpstan-baseline.neon
142126
../../bin/phpstan -vvv
127+
- script: |
128+
cd e2e/result-cache-atomic-save
129+
../../bin/phpstan
130+
INODE=$(ls -i tmp/resultCache.php | awk '{print $1}')
131+
../../bin/phpstan
132+
# The cache is written next to its final path and renamed into place, so saving it
133+
# again replaces the file rather than truncating and rewriting the one the next run
134+
# reads. That is what keeps a run killed mid-save from leaving a partial cache behind.
135+
REPLACED=$([ "$INODE" != "$(ls -i tmp/resultCache.php | awk '{print $1}')" ] && echo replaced || echo 'written in place')
136+
../bashunit -a equals 'replaced' "$REPLACED"
137+
# A completed save leaves nothing next to the cache file.
138+
LEFTOVERS=$(ls tmp/ | grep -c '\.tmp$' || true)
139+
../bashunit -a equals '0' "$LEFTOVERS"
140+
OUTPUT=$(../../bin/phpstan -vvv 2>&1)
141+
echo "$OUTPUT"
142+
../bashunit -a contains 'Result cache restored. 0 files will be reanalysed.' "$OUTPUT"
143143
- script: |
144144
cd e2e/bug-14514
145145
composer install

0 commit comments

Comments
 (0)