Skip to content

Commit

Permalink
Merge pull request #391 from ergebnis/fix/order
Browse files Browse the repository at this point in the history
Fix: Order
  • Loading branch information
localheinz authored Dec 1, 2023
2 parents da2be2b + 5f6fbad commit 00d957d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,14 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Remove phpunit/phpunit"
run: "composer remove phpunit/phpunit --ansi --no-interaction --no-progress"

- name: "Install ${{ matrix.dependencies }} dependencies with composer"
uses: "ergebnis/.github/actions/composer/[email protected]"
with:
dependencies: "${{ matrix.dependencies }}"

- name: "Remove phpunit/phpunit"
run: "composer remove phpunit/phpunit --ansi --no-interaction --no-progress"

- name: "Remove git placeholder configuration with jq"
run: "echo $(cat box.json | jq 'del(.git)') > box.json"

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ jobs:
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"

- name: "Remove phpunit/phpunit"
run: "composer remove phpunit/phpunit --ansi --no-interaction --no-progress"

- name: "Install ${{ matrix.dependencies }} dependencies with composer"
uses: "ergebnis/.github/actions/composer/[email protected]"
with:
dependencies: "${{ matrix.dependencies }}"

- name: "Remove phpunit/phpunit"
run: "composer remove phpunit/phpunit --ansi --no-interaction --no-progress"

- name: "Install dependencies with phive"
uses: "ergebnis/.github/actions/phive/[email protected]"
with:
Expand Down

0 comments on commit 00d957d

Please sign in to comment.