Skip to content

Commit c1bb009

Browse files
committed
minor #738 Enhancement: Simplify workflow (OskarStark)
This PR was merged into the 1.0-dev branch. Discussion ---------- Enhancement: Simplify workflow Commits ------- bb5370d Enhancement: Simplify workflow
2 parents 2feb81b + bb5370d commit c1bb009

File tree

1 file changed

+10
-30
lines changed

1 file changed

+10
-30
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,10 @@ jobs:
4040
run: "composer validate --strict --no-check-lock"
4141

4242
-
43-
name: "Determine composer cache directory"
44-
id: "determine-composer-cache-directory"
45-
run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
46-
47-
-
48-
name: "Cache dependencies installed with composer"
49-
uses: "actions/cache@v2"
43+
name: "Composer install"
44+
uses: "ramsey/composer-install@v1"
5045
with:
51-
path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
52-
key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}"
53-
restore-keys: "php-${{ matrix.php-version }}-composer-"
54-
55-
-
56-
name: "Install dependencies with composer"
57-
run: "composer install --no-interaction --no-progress --no-suggest --no-scripts"
46+
composer-options: "--no-suggest --no-scripts"
5847

5948
-
6049
name: "Run friendsofphp/php-cs-fixer"
@@ -90,13 +79,16 @@ jobs:
9079
- '7.4'
9180
symfony-skeleton-stability:
9281
- 'stable'
82+
composer-options: ['--no-suggest']
9383
allow-failures: [false]
9484
include:
9585
- php-version: '7.4'
9686
symfony-skeleton-stability: 'dev'
87+
composer-options: '--no-suggest'
9788
allow-failures: true
9889
- php-version: '8.0'
9990
symfony-skeleton-stability: 'dev'
91+
composer-options: '--no-suggest --ignore-platform-req=php'
10092
allow-failures: true
10193

10294
steps:
@@ -125,25 +117,13 @@ jobs:
125117
- name: "Add PHPUnit matcher"
126118
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
127119

128-
- name: "Set composer cache directory"
129-
id: composer-cache
130-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
131-
132-
- name: "Cache composer"
133-
uses: actions/[email protected]
134-
with:
135-
path: ${{ steps.composer-cache.outputs.dir }}
136-
key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}-symfony-skeleton-stability-${{ matrix.symfony-skeleton-stability }}-allow-failures-${{ matrix.allow-failures }}
137-
restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer-
138-
139120
- name: "Require symfony/flex"
140121
run: composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-main
141122

142-
- if: matrix.php-version != '8.0'
143-
run: composer update
144-
145-
- if: matrix.php-version == '8.0'
146-
run: composer update --ignore-platform-req=php
123+
- name: "Composer install"
124+
uses: "ramsey/composer-install@v1"
125+
with:
126+
composer-options: "${{ matrix.composer-options }}"
147127

148128
- name: "Install PHPUnit"
149129
run: vendor/bin/simple-phpunit install

0 commit comments

Comments
 (0)