Skip to content

Commit fd89759

Browse files
committed
Cache fix attempt 3 simplify version keys
1 parent ddf9d0e commit fd89759

File tree

1 file changed

+46
-49
lines changed

1 file changed

+46
-49
lines changed

.github/workflows/ci.yml

Lines changed: 46 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ jobs:
1212
fail-fast: true
1313
matrix:
1414
php: [8.3, 8.4]
15-
laravel: [11.*, 12.*]
15+
laravel: [11, 12]
1616
include:
17-
- laravel: 11.*
18-
testbench: 9.*
19-
larastan: 3.*
20-
pint: 1.*
21-
- laravel: 12.*
22-
testbench: 10.*
23-
larastan: 3.*
24-
pint: 1.*
17+
- laravel: 11
18+
testbench: 9
19+
larastan: 3
20+
pint: 1
21+
- laravel: 12
22+
testbench: 10
23+
larastan: 3
24+
pint: 1
2525

2626
name: Build - PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
2727
steps:
@@ -46,11 +46,11 @@ jobs:
4646
- name: Install dependencies
4747
run: |
4848
composer --version
49-
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
50-
composer require "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev
51-
composer require "larastan/larastan:${{ matrix.larastan }}" --no-interaction --no-update --dev
52-
composer require "laravel/pint:${{ matrix.pint }}" --no-interaction --no-update --dev
53-
composer update --prefer-dist --no-interaction --no-suggest --dev
49+
composer require "laravel/framework:${{ matrix.laravel }}.*" --no-interaction --no-update
50+
composer require "orchestra/testbench:${{ matrix.testbench }}.*" --no-interaction --no-update --dev
51+
composer require "larastan/larastan:${{ matrix.larastan }}.*" --no-interaction --no-update --dev
52+
composer require "laravel/pint:${{ matrix.pint }}.*" --no-interaction --no-update --dev
53+
composer update --prefer-dist --no-interaction
5454
composer dump
5555
5656
lint:
@@ -61,10 +61,10 @@ jobs:
6161

6262
env:
6363
php: 8.4
64-
laravel: 12.*
65-
testbench: 10.*
66-
larastan: 3.*
67-
pint: 1.*
64+
laravel: 12
65+
testbench: 10
66+
larastan: 3
67+
pint: 1
6868

6969
name: Lint
7070
steps:
@@ -83,19 +83,18 @@ jobs:
8383
uses: shivammathur/setup-php@v2
8484
with:
8585
php-version: ${{ env.php }}
86-
extensions: curl, mbstring, zip, pcntl, iconv
86+
extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
8787
coverage: none
8888
tools: composer:v2
8989

9090
- name: Install dependencies
91-
if: steps.cache.outputs.cache-hit != 'true'
9291
run: |
9392
composer --version
94-
composer require "laravel/framework:${{ env.laravel }}" --no-interaction --no-update
95-
composer require "orchestra/testbench:${{ env.testbench }}" --no-interaction --no-update --dev
96-
composer require "larastan/larastan:${{ env.larastan }}" --no-interaction --no-update --dev
97-
composer require "laravel/pint:${{ env.pint }}" --no-interaction --no-update --dev
98-
composer update --prefer-dist --no-interaction --no-suggest --dev
93+
composer require "laravel/framework:${{ env.laravel }}.*" --no-interaction --no-update
94+
composer require "orchestra/testbench:${{ env.testbench }}.*" --no-interaction --no-update --dev
95+
composer require "larastan/larastan:${{ env.larastan }}.*" --no-interaction --no-update --dev
96+
composer require "laravel/pint:${{ env.pint }}.*" --no-interaction --no-update --dev
97+
composer update --prefer-dist --no-interaction
9998
composer dump
10099
101100
- name: Pint (check styles)
@@ -109,10 +108,10 @@ jobs:
109108

110109
env:
111110
php: 8.4
112-
laravel: 12.*
113-
testbench: 10.*
114-
larastan: 3.*
115-
pint: 1.*
111+
laravel: 12
112+
testbench: 10
113+
larastan: 3
114+
pint: 1
116115

117116
name: Static Analysis
118117
steps:
@@ -131,18 +130,17 @@ jobs:
131130
uses: shivammathur/setup-php@v2
132131
with:
133132
php-version: ${{ env.php }}
134-
extensions: curl, mbstring, zip, pcntl, iconv
133+
extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv
135134
coverage: none
136135
tools: composer:v2
137136

138137
- name: Install dependencies
139-
if: steps.cache.outputs.cache-hit != 'true'
140138
run: |
141139
composer --version
142-
composer require "laravel/framework:${{ env.laravel }}" --no-interaction --no-update
143-
composer require "orchestra/testbench:${{ env.testbench }}" --no-interaction --no-update --dev
144-
composer require "larastan/larastan:${{ env.larastan }}" --no-interaction --no-update --dev
145-
composer require "laravel/pint:${{ env.pint }}" --no-interaction --no-update --dev
140+
composer require "laravel/framework:${{ env.laravel }}.*" --no-interaction --no-update
141+
composer require "orchestra/testbench:${{ env.testbench }}.*" --no-interaction --no-update --dev
142+
composer require "larastan/larastan:${{ env.larastan }}.*" --no-interaction --no-update --dev
143+
composer require "laravel/pint:${{ env.pint }}.*" --no-interaction --no-update --dev
146144
composer update --prefer-dist --no-interaction --no-suggest --dev
147145
composer dump
148146
@@ -159,16 +157,16 @@ jobs:
159157
fail-fast: true
160158
matrix:
161159
php: [8.3, 8.4]
162-
laravel: [11.*, 12.*]
160+
laravel: [11, 12]
163161
include:
164-
- laravel: 11.*
165-
testbench: 9.*
166-
larastan: 3.*
167-
pint: 1.*
168-
- laravel: 12.*
169-
testbench: 10.*
170-
larastan: 3.*
171-
pint: 1.*
162+
- laravel: 11
163+
testbench: 9
164+
larastan: 3
165+
pint: 1
166+
- laravel: 12
167+
testbench: 10
168+
larastan: 3
169+
pint: 1
172170

173171
name: Tests - PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
174172
steps:
@@ -192,13 +190,12 @@ jobs:
192190
tools: composer:v2
193191

194192
- name: Install dependencies
195-
if: steps.cache.outputs.cache-hit != 'true'
196193
run: |
197194
composer --version
198-
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
199-
composer require "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev
200-
composer require "larastan/larastan:${{ matrix.larastan }}" --no-interaction --no-update --dev
201-
composer require "laravel/pint:${{ matrix.pint }}" --no-interaction --no-update --dev
195+
composer require "laravel/framework:${{ matrix.laravel }}.*" --no-interaction --no-update
196+
composer require "orchestra/testbench:${{ matrix.testbench }}.*" --no-interaction --no-update --dev
197+
composer require "larastan/larastan:${{ matrix.larastan }}.*" --no-interaction --no-update --dev
198+
composer require "laravel/pint:${{ matrix.pint }}.*" --no-interaction --no-update --dev
202199
composer update --prefer-dist --no-interaction --no-suggest --dev
203200
composer dump
204201

0 commit comments

Comments
 (0)