Skip to content

Commit 5fcc305

Browse files
schlesseraschlessera
committed
Update file(s) from wp-cli/.github
1 parent fad7fcd commit 5fcc305

3 files changed

Lines changed: 20 additions & 85 deletions

File tree

‎.github/workflows/code-quality.yml‎

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,11 @@ jobs:
2828
php-version: '7.4'
2929
tools: cs2pr
3030

31-
- name: Get Composer cache directory
31+
- name: Install Composer dependencies & cache dependencies
3232
if: steps.check_composer_file.outputs.files_exists == 'true'
33-
id: composer-cache
34-
run: |
35-
echo "::set-output name=dir::$(composer config cache-files-dir)"
36-
37-
- name: Use Composer cache
38-
if: steps.check_composer_file.outputs.files_exists == 'true'
39-
uses: actions/cache@v1
40-
with:
41-
path: ${{ steps['composer-cache'].outputs.dir }}
42-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
43-
restore-keys: |
44-
${{ runner.os }}-composer-
45-
46-
- name: Install dependencies
47-
if: steps.check_composer_file.outputs.files_exists == 'true'
48-
run: COMPOSER_ROOT_VERSION=dev-master composer install --prefer-dist --no-progress --no-suggest
33+
uses: "ramsey/composer-install@v1"
34+
env:
35+
COMPOSER_ROOT_VERSION: 'dev-master'
4936

5037
- name: Check existence of vendor/bin/parallel-lint file
5138
id: check_linter_file
@@ -78,24 +65,11 @@ jobs:
7865
php-version: '7.4'
7966
tools: cs2pr
8067

81-
- name: Get Composer cache directory
82-
if: steps.check_files.outputs.files_exists == 'true'
83-
id: composer-cache
84-
run: |
85-
echo "::set-output name=dir::$(composer config cache-files-dir)"
86-
87-
- name: Use Composer cache
88-
if: steps.check_files.outputs.files_exists == 'true'
89-
uses: actions/cache@v1
90-
with:
91-
path: ${{ steps.composer-cache.outputs.dir }}
92-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
93-
restore-keys: |
94-
${{ runner.os }}-composer-
95-
96-
- name: Install dependencies
68+
- name: Install Composer dependencies & cache dependencies
9769
if: steps.check_files.outputs.files_exists == 'true'
98-
run: COMPOSER_ROOT_VERSION=dev-master composer install --prefer-dist --no-progress --no-suggest
70+
uses: "ramsey/composer-install@v1"
71+
env:
72+
COMPOSER_ROOT_VERSION: 'dev-master'
9973

10074
- name: Check existence of vendor/bin/phpcs file
10175
id: check_phpcs_binary_file

‎.github/workflows/regenerate-readme.yml‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,11 @@ jobs:
3030
with:
3131
files: "composer.json"
3232

33-
- name: Get Composer cache directory
33+
- name: Install Composer dependencies & cache dependencies
3434
if: steps.check_composer_file.outputs.files_exists == 'true'
35-
id: composer-cache
36-
run: |
37-
echo "::set-output name=dir::$(composer config cache-files-dir)"
38-
39-
- name: Use Composer cache
40-
if: steps.check_composer_file.outputs.files_exists == 'true'
41-
uses: actions/cache@v1
42-
with:
43-
path: ${{ steps['composer-cache'].outputs.dir }}
44-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
45-
restore-keys: |
46-
${{ runner.os }}-composer-
47-
48-
- name: Install dependencies
49-
if: steps.check_composer_file.outputs.files_exists == 'true'
50-
run: COMPOSER_ROOT_VERSION=dev-master composer install --prefer-dist --no-progress --no-suggest
35+
uses: "ramsey/composer-install@v1"
36+
env:
37+
COMPOSER_ROOT_VERSION: 'dev-master'
5138

5239
- name: Configure git user
5340
run: |

‎.github/workflows/testing.yml‎

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,11 @@ jobs:
3434
coverage: none
3535
tools: composer,cs2pr
3636

37-
- name: Get Composer cache Directory
37+
- name: Install Composer dependencies & cache dependencies
3838
if: steps.check_files.outputs.files_exists == 'true'
39-
id: composer-cache
40-
run: |
41-
echo "::set-output name=dir::$(composer config cache-files-dir)"
42-
43-
- name: Use Composer cache
44-
if: steps.check_files.outputs.files_exists == 'true'
45-
uses: actions/cache@master
46-
with:
47-
path: ${{ steps['composer-cache'].outputs.dir }}
48-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
49-
restore-keys: |
50-
${{ runner.os }}-composer-
51-
52-
- name: Install dependencies
53-
if: steps.check_files.outputs.files_exists == 'true'
54-
run: COMPOSER_ROOT_VERSION=dev-master composer install --prefer-dist --no-progress --no-suggest
39+
uses: "ramsey/composer-install@v1"
40+
env:
41+
COMPOSER_ROOT_VERSION: 'dev-master'
5542

5643
- name: Setup problem matcher to provide annotations for PHPUnit
5744
if: steps.check_files.outputs.files_exists == 'true'
@@ -128,29 +115,16 @@ jobs:
128115
coverage: none
129116
tools: composer
130117

131-
- name: Get Composer cache Directory
132-
if: steps.check_files.outputs.files_exists == 'true'
133-
id: composer-cache
134-
run: |
135-
echo "::set-output name=dir::$(composer config cache-files-dir)"
136-
137-
- name: Use Composer cache
138-
if: steps.check_files.outputs.files_exists == 'true'
139-
uses: actions/cache@master
140-
with:
141-
path: ${{ steps['composer-cache'].outputs.dir }}
142-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
143-
restore-keys: |
144-
${{ runner.os }}-composer-
145-
146118
- name: Change ImageMagick policy to allow pdf->png conversion.
147119
if: steps.check_files.outputs.files_exists == 'true'
148120
run: |
149121
sudo sed -i 's/^.*policy.*coder.*none.*PDF.*//' /etc/ImageMagick-6/policy.xml
150122
151-
- name: Install dependencies
123+
- name: Install Composer dependencies & cache dependencies
152124
if: steps.check_files.outputs.files_exists == 'true'
153-
run: COMPOSER_ROOT_VERSION=dev-master composer install --prefer-dist --no-progress --no-suggest
125+
uses: "ramsey/composer-install@v1"
126+
env:
127+
COMPOSER_ROOT_VERSION: 'dev-master'
154128

155129
- name: Start MySQL server
156130
if: steps.check_files.outputs.files_exists == 'true'

0 commit comments

Comments
 (0)