Skip to content

Commit fdad4b5

Browse files
committed
Use ramsey/composer-install GitHub action
Replaces manual Composer dependencies installation and cache with the ramsey/composer-install GitHub action. - https://github.com/marketplace/actions/install-composer-dependencies Includes other minor formatting changes. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 24bed51 commit fdad4b5

File tree

7 files changed

+162
-168
lines changed

7 files changed

+162
-168
lines changed

.github/workflows/lint-and-analyse-php.yml

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,32 @@ jobs:
1313
runs-on: ubuntu-latest
1414
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1515
steps:
16-
- uses: actions/checkout@v2
17-
- uses: actions/setup-node@v1
16+
- name: Checkout code
17+
uses: actions/checkout@v2
18+
19+
- name: Set up Node
20+
uses: actions/setup-node@v1
1821
with:
1922
node-version: 12
20-
- name: Get yarn cache directory path
23+
24+
- name: Get Yarn cache directory path
2125
id: yarn-cache-dir-path
2226
run: echo "::set-output name=dir::$(yarn cache dir)"
23-
- name: yarn cache
27+
28+
- name: Cache Yarn dependencies
2429
uses: actions/cache@v2
2530
with:
2631
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
2732
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
2833
restore-keys: |
2934
${{ runner.os }}-yarn-
35+
3036
- name: Install modules
3137
run: yarn install --non-interactive
32-
- name: Lint JS files
38+
39+
- name: Lint JavaScript files
3340
run: yarn run js-lint --quiet
41+
3442
- name: Lint CSS files
3543
run: yarn run css-lint
3644

@@ -41,40 +49,37 @@ jobs:
4149
matrix:
4250
php-version: ["7.2"]
4351
steps:
44-
- uses: actions/checkout@v2
45-
- name: Use PHP ${{ matrix.php-version }}
52+
- name: Checkout code
53+
uses: actions/checkout@v2
54+
55+
- name: Set up PHP ${{ matrix.php-version }}
4656
uses: shivammathur/setup-php@v2
4757
with:
4858
php-version: ${{ matrix.php-version }}
49-
- name: Validate composer.json and composer.lock
50-
run: composer validate
5159

52-
- name: Get Composer cache directory
53-
id: composer-cache
54-
run: |
55-
echo "::set-output name=dir::$(composer config cache-files-dir)"
60+
- name: Validate composer.json and composer.lock
61+
run: composer validate --strict
5662

57-
- name: Cache dependencies
58-
uses: actions/cache@v2
63+
- name: Install Composer dependencies
64+
uses: ramsey/composer-install@v1
5965
with:
60-
path: ${{ steps.composer-cache.outputs.dir }}
61-
key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}
62-
restore-keys: |
63-
composer-${{ runner.os }}-${{ matrix.php-version }}-
66+
dependency-versions: highest
67+
# Ignore zip for php-webdriver/webdriver
68+
composer-options: "--ignore-platform-req=ext-zip"
6469

6570
- name: Cache coding-standard
6671
uses: actions/cache@v2
6772
with:
6873
path: .phpcs-cache
6974
key: phpcs-cache
70-
- name: Install dependencies
71-
# Ignore zip for php-webdriver/webdriver
72-
run: composer install --ignore-platform-req=ext-zip
75+
7376
- name: Lint PHP files
7477
run: ./test/ci-phplint
78+
7579
- name: Check coding-standard
7680
run: composer phpcs
77-
- name: Check twig templates
81+
82+
- name: Check Twig templates
7883
run: composer run twig-lint
7984

8085
analyse-php:
@@ -84,29 +89,22 @@ jobs:
8489
matrix:
8590
php-version: ["7.2"]
8691
steps:
87-
- uses: actions/checkout@v2
88-
- name: Use PHP ${{ matrix.php-version }}
92+
- name: Checkout code
93+
uses: actions/checkout@v2
94+
95+
- name: Set up PHP ${{ matrix.php-version }}
8996
uses: shivammathur/setup-php@v2
9097
with:
9198
php-version: ${{ matrix.php-version }}
9299
extensions: mbstring, iconv, mysqli, zip, gd, bz2
93100

94-
- name: Get Composer cache directory
95-
id: composer-cache
96-
run: |
97-
echo "::set-output name=dir::$(composer config cache-files-dir)"
98-
99-
- name: Cache dependencies
100-
uses: actions/cache@v2
101+
- name: Install Composer dependencies
102+
uses: ramsey/composer-install@v1
101103
with:
102-
path: ${{ steps.composer-cache.outputs.dir }}
103-
key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}
104-
restore-keys: |
105-
composer-${{ runner.os }}-${{ matrix.php-version }}-
104+
dependency-versions: highest
106105

107-
- name: Install dependencies
108-
run: composer install
109-
- name: Analyse files with phpstan
106+
- name: Analyse files with PHPStan
110107
run: composer phpstan -- --memory-limit 2G
111-
- name: Analyse files with psalm
108+
109+
- name: Analyse files with Psalm
112110
run: composer psalm -- --shepherd

.github/workflows/lint-docs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1515
steps:
16-
- uses: actions/checkout@v2
16+
- name: Checkout code
17+
uses: actions/checkout@v2
18+
1719
- name: Lint phpdoc blocks
1820
uses: sudo-bot/action-doctum@v5
1921
with:

.github/workflows/mutation-tests.yml

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,14 @@ on:
99
jobs:
1010
tests:
1111
name: Mutation tests with PHP ${{ matrix.php-version }}
12-
13-
runs-on: ${{ matrix.operating-system }}
1412
if: "!contains(github.event.head_commit.message, '[ci skip]')"
15-
13+
runs-on: ${{ matrix.operating-system }}
1614
strategy:
1715
matrix:
1816
php-version: ["8.0"]
1917
operating-system: [ubuntu-latest]
20-
2118
steps:
22-
- name: Checkout
19+
- name: Checkout code
2320
uses: actions/checkout@v2
2421

2522
- name: Fetch github.base_ref (for diffing)
@@ -31,7 +28,10 @@ jobs:
3128
run: |
3229
sudo apt-get install -y gettext
3330
34-
- name: Install PHP ${{ matrix.php-version }}
31+
- name: Generate mo files
32+
run: ./scripts/generate-mo --quiet
33+
34+
- name: Set up PHP ${{ matrix.php-version }}
3535
uses: shivammathur/setup-php@v2
3636
with:
3737
php-version: ${{ matrix.php-version }}
@@ -44,23 +44,10 @@ jobs:
4444
run: |
4545
phive --no-progress install --target ./build/tools --trust-gpg-keys C5095986493B4AA0 infection
4646
47-
- name: Get Composer cache directory
48-
id: composer-cache
49-
run: |
50-
echo "::set-output name=dir::$(composer config cache-files-dir)"
51-
52-
- name: Cache dependencies
53-
uses: actions/cache@v2
47+
- name: Install Composer dependencies
48+
uses: ramsey/composer-install@v1
5449
with:
55-
path: ${{ steps.composer-cache.outputs.dir }}
56-
key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}
57-
restore-keys: |
58-
composer-${{ runner.os }}-${{ matrix.php-version }}-
59-
60-
- name: Install dependencies
61-
run: |
62-
composer update --no-interaction --no-progress
63-
./scripts/generate-mo --quiet
50+
dependency-versions: highest
6451

6552
- name: Collect coverage report
6653
run: |

.github/workflows/other-tools.yml

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,17 @@ jobs:
1313
runs-on: ubuntu-latest
1414
if: "!contains(github.event.head_commit.message, '[ci skip]')"
1515
steps:
16-
- uses: actions/checkout@v2
17-
- uses: actions/setup-python@v2
16+
- name: Checkout code
17+
uses: actions/checkout@v2
18+
19+
- name: Set up Python
20+
uses: actions/setup-python@v2
1821
with:
1922
python-version: '3.6'
23+
2024
- name: Install Sphinx for the documentation build
2125
run: pip install 'Sphinx'
26+
2227
- name: Build the documentation
2328
run: make -C doc html SPHINXOPTS='-n -W -a'
2429

@@ -29,50 +34,51 @@ jobs:
2934
matrix:
3035
php-version: ["7.2"]
3136
steps:
32-
- uses: actions/checkout@v2
33-
- name: Use PHP ${{ matrix.php-version }}
37+
- name: Checkout code
38+
uses: actions/checkout@v2
39+
40+
- name: Set up PHP ${{ matrix.php-version }}
3441
uses: shivammathur/setup-php@v2
3542
with:
3643
php-version: ${{ matrix.php-version }}
3744
extensions: mbstring, iconv, mysqli, zip, gd
3845
tools: composer:v2
3946

40-
- name: Get Composer cache directory
41-
id: composer-cache
42-
run: |
43-
echo "::set-output name=dir::$(composer config cache-files-dir)"
44-
45-
- name: Cache dependencies
46-
uses: actions/cache@v2
47+
- name: Install Composer dependencies
48+
uses: ramsey/composer-install@v1
4749
with:
48-
path: ${{ steps.composer-cache.outputs.dir }}
49-
key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}
50-
restore-keys: |
51-
composer-${{ runner.os }}-${{ matrix.php-version }}-
50+
dependency-versions: highest
5251

53-
- name: Install dependencies
54-
run: composer install
55-
- uses: actions/setup-node@v1
52+
- name: Set up Node
53+
uses: actions/setup-node@v1
5654
with:
5755
node-version: 12
58-
- name: Get yarn cache directory path
56+
57+
- name: Get Yarn cache directory path
5958
id: yarn-cache-dir-path
6059
run: echo "::set-output name=dir::$(yarn cache dir)"
61-
- name: yarn cache
60+
61+
- name: Cache Yarn dependencies
6262
uses: actions/cache@v2
6363
with:
6464
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
6565
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
6666
restore-keys: |
6767
${{ runner.os }}-yarn-
68+
6869
- name: Install modules
6970
run: yarn install --non-interactive
70-
- uses: actions/setup-python@v2
71+
72+
- name: Set up Python
73+
uses: actions/setup-python@v2
7174
with:
7275
python-version: '3.6'
76+
7377
- name: Install gettext
7478
run: sudo apt-get install -y gettext
79+
7580
- name: Install Sphinx for the documentation build
7681
run: pip install 'Sphinx'
82+
7783
- name: Build the release
7884
run: ./scripts/create-release.sh --ci

0 commit comments

Comments
 (0)