Skip to content

Commit

Permalink
Merge pull request #463 from ergebnis/fix/test-util
Browse files Browse the repository at this point in the history
Fix: Remove `ergebnis/test-util`
  • Loading branch information
localheinz committed Dec 30, 2021
2 parents 2d38d9d + c70bb33 commit 1d92178
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 127 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Set COMPOSER_ROOT_VERSION environment variable"
uses: "docker://ergebnis/composer-root-version-action:0.2.1"

- name: "Install ${{ matrix.dependencies }} dependencies with composer"
uses: "./.github/actions/composer/composer/install"
with:
Expand Down Expand Up @@ -111,9 +108,6 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Set COMPOSER_ROOT_VERSION environment variable"
uses: "docker://ergebnis/composer-root-version-action:0.2.1"

- name: "Install ${{ matrix.dependencies }} dependencies with composer"
uses: "./.github/actions/composer/composer/install"
with:
Expand Down Expand Up @@ -169,9 +163,6 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Set COMPOSER_ROOT_VERSION environment variable"
uses: "docker://ergebnis/composer-root-version-action:0.2.1"

- name: "Install ${{ matrix.dependencies }} dependencies with composer"
uses: "./.github/actions/composer/composer/install"
with:
Expand Down Expand Up @@ -214,9 +205,6 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Set COMPOSER_ROOT_VERSION environment variable"
uses: "docker://ergebnis/composer-root-version-action:0.2.1"

- name: "Install ${{ matrix.dependencies }} dependencies with composer"
uses: "./.github/actions/composer/composer/install"
with:
Expand Down Expand Up @@ -259,9 +247,6 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Set COMPOSER_ROOT_VERSION environment variable"
uses: "docker://ergebnis/composer-root-version-action:0.2.1"

- name: "Install ${{ matrix.dependencies }} dependencies with composer"
uses: "./.github/actions/composer/composer/install"
with:
Expand Down Expand Up @@ -323,9 +308,6 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Set COMPOSER_ROOT_VERSION environment variable"
uses: "docker://ergebnis/composer-root-version-action:0.2.1"

- name: "Install ${{ matrix.dependencies }} dependencies with composer"
uses: "./.github/actions/composer/composer/install"
with:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/renew.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Set COMPOSER_ROOT_VERSION environment variable"
uses: "docker://ergebnis/composer-root-version-action:0.2.1"

- name: "Install ${{ matrix.dependencies }} dependencies with composer"
uses: "./.github/actions/composer/composer/install"
with:
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
COMPOSER_ROOT_VERSION:=1.0-dev
MIN_COVERED_MSI:=86
MIN_MSI:=84

Expand Down Expand Up @@ -47,4 +46,4 @@ tests: vendor ## Runs unit tests with phpunit/phpunit

vendor: composer.json composer.lock
composer validate --strict
COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} composer install --no-interaction --no-progress
composer install --no-interaction --no-progress
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"ergebnis/composer-normalize": "^2.19.0",
"ergebnis/license": "^1.1.0",
"ergebnis/php-cs-fixer-config": "^2.14.0",
"ergebnis/test-util": "^1.0.0",
"fakerphp/faker": "^1.17.0",
"infection/infection": "~0.15.3",
"phpunit/phpunit": "^8.5.22",
"psalm/plugin-phpunit": "~0.16.1",
Expand Down
138 changes: 35 additions & 103 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1d92178

Please sign in to comment.