Skip to content

Commit 96c4ba0

Browse files
weaverryanweaverryan
committed
minor #258 Cache deps where possible (kbond)
This PR was squashed before being merged into the 2.x branch. Discussion ---------- Cache deps where possible | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | Tickets | n/a | License | MIT Commits ------- e3e2d84 Cache deps where possible
2 parents 6715a03 + e3e2d84 commit 96c4ba0

File tree

2 files changed

+139
-97
lines changed

2 files changed

+139
-97
lines changed

‎.github/workflows/test-turbo.yml

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,9 @@ jobs:
1717
php-version: '8.0'
1818
extensions: zip
1919

20-
- name: Get composer cache directory
21-
id: composercache
22-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
23-
24-
- name: Cache dependencies
25-
uses: actions/cache@v2
20+
- uses: ramsey/composer-install@v2
2621
with:
27-
path: ${{ steps.composercache.outputs.dir }}
28-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
29-
restore-keys: ${{ runner.os }}-composer-
30-
31-
- name: Install dependencies
32-
working-directory: src/Turbo
33-
run: composer install --prefer-dist
22+
working-directory: src/Turbo
3423

3524
- name: Install PHPUnit dependencies
3625
working-directory: src/Turbo
@@ -71,20 +60,9 @@ jobs:
7160
php-version: ${{ matrix.php-versions }}
7261
extensions: zip, pdo_sqlite
7362

74-
- name: Get composer cache directory
75-
id: composercache
76-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
77-
78-
- name: Cache PHP dependencies
79-
uses: actions/cache@v2
63+
- uses: ramsey/composer-install@v2
8064
with:
81-
path: ${{ steps.composercache.outputs.dir }}
82-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
83-
restore-keys: ${{ runner.os }}-composer-
84-
85-
- name: Install PHP dependencies
86-
working-directory: src/Turbo
87-
run: composer install --prefer-dist
65+
working-directory: src/Turbo
8866

8967
- name: Get yarn cache directory path
9068
id: yarn-cache-dir-path
@@ -143,20 +121,10 @@ jobs:
143121
php-version: '8.0'
144122
extensions: zip, pdo_sqlite
145123

146-
- name: Get composer cache directory
147-
id: composercache
148-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
149-
150-
- name: Cache PHP dependencies
151-
uses: actions/cache@v2
124+
- uses: ramsey/composer-install@v2
152125
with:
153-
path: ${{ steps.composercache.outputs.dir }}
154-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
155-
restore-keys: ${{ runner.os }}-composer-
156-
157-
- name: Install PHP dependencies
158-
working-directory: src/Turbo
159-
run: composer update --prefer-dist --prefer-lowest --prefer-stable
126+
working-directory: src/Turbo
127+
dependency-versions: lowest
160128

161129
- name: Get yarn cache directory path
162130
id: yarn-cache-dir-path

‎.github/workflows/test.yaml

Lines changed: 132 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@master
21+
- name: Get yarn cache directory path
22+
id: yarn-cache-dir-path
23+
run: echo "::set-output name=dir::$(yarn cache dir)"
24+
- uses: actions/cache@v2
25+
id: yarn-cache
26+
with:
27+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
28+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
29+
restore-keys: |
30+
${{ runner.os }}-yarn-
2131
- run: yarn
2232
- run: yarn check-lint
2333
- run: yarn check-format
@@ -26,6 +36,16 @@ jobs:
2636
runs-on: ubuntu-latest
2737
steps:
2838
- uses: actions/checkout@master
39+
- name: Get yarn cache directory path
40+
id: yarn-cache-dir-path
41+
run: echo "::set-output name=dir::$(yarn cache dir)"
42+
- uses: actions/cache@v2
43+
id: yarn-cache
44+
with:
45+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
46+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
47+
restore-keys: |
48+
${{ runner.os }}-yarn-
2949
- run: yarn && yarn build
3050
- name: Check if js dist files are current
3151
id: changes
@@ -44,26 +64,42 @@ jobs:
4464
- uses: shivammathur/setup-php@v2
4565
with:
4666
php-version: '7.2'
47-
- name: Chartjs
48-
run: |
49-
cd src/Chartjs
50-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
51-
php vendor/bin/simple-phpunit
52-
- name: Cropperjs
53-
run: |
54-
cd src/Cropperjs
55-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
56-
php vendor/bin/simple-phpunit
57-
- name: Dropzone
58-
run: |
59-
cd src/Dropzone
60-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
61-
php vendor/bin/simple-phpunit
62-
- name: LazyImage
63-
run: |
64-
cd src/LazyImage
65-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
66-
php vendor/bin/simple-phpunit
67+
68+
- name: Chartjs Dependencies
69+
uses: ramsey/composer-install@v2
70+
with:
71+
working-directory: src/Chartjs
72+
dependency-versions: lowest
73+
- name: Chartjs Tests
74+
run: php vendor/bin/simple-phpunit
75+
working-directory: src/Chartjs
76+
77+
- name: Cropperjs Dependencies
78+
uses: ramsey/composer-install@v2
79+
with:
80+
working-directory: src/Cropperjs
81+
dependency-versions: lowest
82+
- name: Cropperjs Tests
83+
run: php vendor/bin/simple-phpunit
84+
working-directory: src/Cropperjs
85+
86+
- name: Dropzone Dependencies
87+
uses: ramsey/composer-install@v2
88+
with:
89+
working-directory: src/Dropzone
90+
dependency-versions: lowest
91+
- name: Dropzone Tests
92+
run: php vendor/bin/simple-phpunit
93+
working-directory: src/Dropzone
94+
95+
- name: LazyImage Dependencies
96+
uses: ramsey/composer-install@v2
97+
with:
98+
working-directory: src/LazyImage
99+
dependency-versions: lowest
100+
- name: LazyImage Tests
101+
run: php vendor/bin/simple-phpunit
102+
working-directory: src/LazyImage
67103

68104
tests-php8-low-deps:
69105
runs-on: ubuntu-latest
@@ -72,16 +108,25 @@ jobs:
72108
- uses: shivammathur/setup-php@v2
73109
with:
74110
php-version: '8.0'
75-
- name: TwigComponent
76-
run: |
77-
cd src/TwigComponent
78-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
79-
php vendor/bin/simple-phpunit
80-
- name: LiveComponent
111+
112+
- name: TwigComponent Dependencies
113+
uses: ramsey/composer-install@v2
114+
with:
115+
working-directory: src/TwigComponent
116+
dependency-versions: lowest
117+
- name: TwigComponent Tests
118+
run: php vendor/bin/simple-phpunit
119+
working-directory: src/TwigComponent
120+
121+
- name: LiveComponent Dependencies
122+
uses: ramsey/composer-install@v2
123+
with:
124+
working-directory: src/LiveComponent
125+
dependency-versions: lowest
126+
- name: LiveComponent Tests
127+
working-directory: src/LiveComponent
81128
run: |
82-
cd src/LiveComponent
83129
php ../../.github/build-packages.php
84-
composer update --prefer-lowest --prefer-dist --no-interaction --no-ansi --no-progress
85130
php vendor/bin/simple-phpunit
86131
87132
tests-php-high-deps:
@@ -91,41 +136,70 @@ jobs:
91136
- uses: shivammathur/setup-php@v2
92137
with:
93138
php-version: '8.0'
94-
- name: Chartjs
95-
run: |
96-
cd src/Chartjs
97-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
98-
php vendor/bin/simple-phpunit
99-
- name: Cropperjs
100-
run: |
101-
cd src/Cropperjs
102-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
103-
php vendor/bin/simple-phpunit
104-
- name: Dropzone
105-
run: |
106-
cd src/Dropzone
107-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
108-
php vendor/bin/simple-phpunit
109-
- name: LazyImage
110-
run: |
111-
cd src/LazyImage
112-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
113-
php vendor/bin/simple-phpunit
114-
- name: TwigComponent
115-
run: |
116-
cd src/TwigComponent
117-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
118-
php vendor/bin/simple-phpunit
119-
- name: LiveComponent
139+
140+
- name: Chartjs Dependencies
141+
uses: ramsey/composer-install@v2
142+
with:
143+
working-directory: src/Chartjs
144+
- name: Chartjs Tests
145+
run: php vendor/bin/simple-phpunit
146+
working-directory: src/Chartjs
147+
148+
- name: Cropperjs Dependencies
149+
uses: ramsey/composer-install@v2
150+
with:
151+
working-directory: src/Cropperjs
152+
- name: Cropperjs Tests
153+
run: php vendor/bin/simple-phpunit
154+
working-directory: src/Cropperjs
155+
156+
- name: Dropzone Dependencies
157+
uses: ramsey/composer-install@v2
158+
with:
159+
working-directory: src/Dropzone
160+
- name: Dropzone Tests
161+
run: php vendor/bin/simple-phpunit
162+
working-directory: src/Dropzone
163+
164+
- name: LazyImage Dependencies
165+
uses: ramsey/composer-install@v2
166+
with:
167+
working-directory: src/LazyImage
168+
- name: LazyImage Tests
169+
run: php vendor/bin/simple-phpunit
170+
working-directory: src/LazyImage
171+
172+
- name: TwigComponent Dependencies
173+
uses: ramsey/composer-install@v2
174+
with:
175+
working-directory: src/TwigComponent
176+
- name: TwigComponent Tests
177+
run: php vendor/bin/simple-phpunit
178+
working-directory: src/TwigComponent
179+
180+
- name: LiveComponent Dependencies
181+
uses: ramsey/composer-install@v2
182+
with:
183+
working-directory: src/LiveComponent
184+
- name: LiveComponent Tests
185+
working-directory: src/LiveComponent
120186
run: |
121-
cd src/LiveComponent
122-
php ../../.github/build-packages.php
123-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
124-
php vendor/bin/simple-phpunit
187+
php ../../.github/build-packages.php
188+
php vendor/bin/simple-phpunit
125189
126190
tests-js:
127191
runs-on: ubuntu-latest
128192
steps:
129193
- uses: actions/checkout@master
194+
- name: Get yarn cache directory path
195+
id: yarn-cache-dir-path
196+
run: echo "::set-output name=dir::$(yarn cache dir)"
197+
- uses: actions/cache@v2
198+
id: yarn-cache
199+
with:
200+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
201+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
202+
restore-keys: |
203+
${{ runner.os }}-yarn-
130204
- run: yarn
131205
- run: yarn test

0 commit comments

Comments
 (0)