Skip to content

Commit 7bee4a4

Browse files
committed
Cleanup installing dependencies in CI
1 parent f34bcdd commit 7bee4a4

File tree

1 file changed

+9
-39
lines changed

1 file changed

+9
-39
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,15 @@ jobs:
1717
- uses: actions/checkout@v2
1818

1919
- name: Install PHP
20-
uses: shivammathur/setup-php@2.9.0
20+
uses: shivammathur/setup-php@v2
2121
with:
2222
php-version: 7.4
2323
coverage: none
2424
extensions: json
2525
tools: cs2pr
2626

27-
- name: Get Composer Cache Directory
28-
id: composer-cache
29-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
30-
31-
- name: Cache dependencies
32-
uses: actions/cache@v1
33-
with:
34-
path: ${{ steps.composer-cache.outputs.dir }}
35-
key: ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}
36-
restore-keys: ${{ runner.os }}-composer-
37-
38-
- name: Install Dependencies
39-
run: COMPOSER_ARGS="--prefer-stable" make
27+
- name: "Install dependencies with Composer"
28+
uses: "ramsey/composer-install@v1"
4029

4130
- name: Coding Standard
4231
env:
@@ -51,26 +40,15 @@ jobs:
5140
- uses: actions/checkout@v2
5241

5342
- name: Install PHP
54-
uses: shivammathur/setup-php@2.9.0
43+
uses: shivammathur/setup-php@v2
5544
with:
5645
php-version: 7.4
5746
coverage: none
5847
extensions: json
5948
tools: cs2pr
6049

61-
- name: Get Composer Cache Directory
62-
id: composer-cache
63-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
64-
65-
- name: Cache dependencies
66-
uses: actions/cache@v1
67-
with:
68-
path: ${{ steps.composer-cache.outputs.dir }}
69-
key: ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}
70-
restore-keys: ${{ runner.os }}-composer-
71-
72-
- name: Install dependencies with composer
73-
run: COMPOSER_ARGS="--prefer-stable" make
50+
- name: "Install dependencies with Composer"
51+
uses: "ramsey/composer-install@v1"
7452

7553
- name: PHPStan
7654
env:
@@ -94,19 +72,11 @@ jobs:
9472
php-version: ${{ matrix.php }}
9573
coverage: none
9674
extensions: json, mbstring
97-
- name: Get Composer Cache Directory
98-
id: composer-cache
99-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
10075

101-
- name: Cache dependencies
102-
uses: actions/cache@v1
76+
- name: "Install dependencies with Composer"
77+
uses: "ramsey/composer-install@v1"
10378
with:
104-
path: ${{ steps.composer-cache.outputs.dir }}
105-
key: ${{ runner.os }}-composer-${{ hashFiles('composer.json') }}
106-
restore-keys: ${{ runner.os }}-composer-
107-
108-
- name: Install Dependencies
109-
run: COMPOSER_ARGS="--prefer-stable ${{ matrix.dependencies }}" make
79+
dependency-versions: "${{ matrix.dependencies }}"
11080

11181
- name: Run tests
11282
run: make test

0 commit comments

Comments
 (0)