Skip to content

Commit 0a081b5

Browse files
authored
Merge pull request #408 from greg0ire/ramsey-composer-install
Ramsey composer install
2 parents ecf9184 + 697ae4b commit 0a081b5

File tree

4 files changed

+25
-45
lines changed

4 files changed

+25
-45
lines changed

.github/workflows/coding-standards.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11

22
name: "Coding Standards"
33

4-
on: ["pull_request", "push"]
4+
on:
5+
pull_request:
6+
branches:
7+
- "*.x"
8+
push:
9+
branches:
10+
- "*.x"
511

612
jobs:
713
coding-standards:
@@ -24,15 +30,10 @@ jobs:
2430
php-version: "${{ matrix.php-version }}"
2531
tools: "cs2pr"
2632

27-
- name: "Cache dependencies installed with Composer"
28-
uses: "actions/cache@v2"
29-
with:
30-
path: "~/.composer/cache"
31-
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
32-
restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
33-
3433
- name: "Install dependencies with Composer"
35-
run: "composer install --no-interaction --no-progress --no-suggest"
34+
uses: "ramsey/composer-install@v1"
35+
with:
36+
dependency-versions: "highest"
3637

3738
# https://github.com/doctrine/.github/issues/3
3839
- name: "Run PHP_CodeSniffer"

.github/workflows/continuous-integration.yml

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ on:
55
pull_request:
66
branches:
77
- "*.x"
8-
- "master"
98
push:
109
branches:
1110
- "*.x"
12-
- "master"
1311

1412
env:
1513
fail-fast: true
@@ -26,12 +24,14 @@ jobs:
2624
- "7.2"
2725
- "7.3"
2826
- "7.4"
29-
deps:
30-
- "normal"
27+
dependencies:
28+
- "highest"
29+
stability:
30+
- "stable"
3131
include:
32-
- deps: "low"
32+
- dependencies: "lowest"
3333
php-version: "7.1"
34-
- deps: "dev"
34+
- stability: "dev"
3535
php-version: "8.0"
3636

3737
steps:
@@ -56,24 +56,15 @@ jobs:
5656
coverage: "xdebug"
5757
ini-values: "zend.assertions=1"
5858

59-
- name: "Cache dependencies installed with composer"
60-
uses: "actions/cache@v2"
61-
with:
62-
path: "~/.composer/cache"
63-
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
64-
restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
65-
6659
- name: "Allow installing dev dependencies"
6760
run: "composer config minimum-stability dev"
68-
if: "${{ matrix.deps == 'dev' }}"
61+
if: "${{ matrix.stability == 'dev' }}"
6962

70-
- name: "Install dependencies with composer"
71-
run: "composer update --no-interaction --prefer-dist"
72-
if: "${{ matrix.deps != 'low' }}"
73-
74-
- name: "Install lowest possible dependencies with composer"
75-
run: "composer update --no-interaction --prefer-dist --prefer-lowest"
76-
if: "${{ matrix.deps == 'low' }}"
63+
- name: "Install dependencies with Composer"
64+
uses: "ramsey/composer-install@v1"
65+
with:
66+
dependency-versions: "${{ matrix.dependencies }}"
67+
composer-options: "--prefer-dist"
7768

7869
- name: "Run PHPUnit"
7970
run: "vendor/bin/phpunit --coverage-clover=coverage.xml"

.github/workflows/static-analysis.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ on:
55
pull_request:
66
branches:
77
- "*.x"
8-
- "master"
98
push:
109
branches:
1110
- "*.x"
12-
- "master"
1311

1412
jobs:
1513
static-analysis-phpstan:
@@ -32,15 +30,10 @@ jobs:
3230
php-version: "${{ matrix.php-version }}"
3331
tools: "cs2pr"
3432

35-
- name: "Cache dependencies installed with composer"
36-
uses: "actions/cache@v2"
33+
- name: "Install dependencies with Composer"
34+
uses: "ramsey/composer-install@v1"
3735
with:
38-
path: "~/.composer/cache"
39-
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
40-
restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
41-
42-
- name: "Install dependencies with composer"
43-
run: "composer install --no-interaction --no-progress --no-suggest"
36+
dependency-versions: "highest"
4437

4538
- name: "Run a static analysis with phpstan/phpstan"
4639
run: "vendor/bin/phpstan analyse --error-format=checkstyle | cs2pr"

composer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,5 @@
4040
},
4141
"autoload-dev": {
4242
"psr-4": { "Doctrine\\Bundle\\MigrationsBundle\\Tests\\": "Tests" }
43-
},
44-
"extra": {
45-
"branch-alias": {
46-
"dev-master": "2.1.x-dev"
47-
}
4843
}
4944
}

0 commit comments

Comments
 (0)