Skip to content

Commit

Permalink
Merge branch 'main' into dbal_v4
Browse files Browse the repository at this point in the history
  • Loading branch information
ramsey authored Apr 27, 2024
2 parents b149bea + 8559f31 commit df93365
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Checkout repository"
uses: "actions/[email protected].1"
uses: "actions/[email protected].3"

- name: "Install PHP"
uses: "shivammathur/setup-php@2.29.0"
uses: "shivammathur/setup-php@2.30.0"
with:
php-version: "latest"
extensions: "bcmath, ctype, gmp"
coverage: "none"

- name: "Install dependencies (Composer)"
uses: "ramsey/composer-install@2.2.0"
uses: "ramsey/composer-install@3.0.0"

- name: "Check syntax (php-parallel-lint)"
run: "composer dev:lint:syntax"
Expand All @@ -51,17 +51,17 @@ jobs:

steps:
- name: "Checkout repository"
uses: "actions/[email protected].1"
uses: "actions/[email protected].3"

- name: "Install PHP"
uses: "shivammathur/setup-php@2.29.0"
uses: "shivammathur/setup-php@2.30.0"
with:
php-version: "latest"
extensions: "bcmath, ctype, gmp"
coverage: "none"

- name: "Install dependencies (Composer)"
uses: "ramsey/composer-install@2.2.0"
uses: "ramsey/composer-install@3.0.0"

- name: "Statically analyze code (PHPStan)"
run: "composer dev:analyze:phpstan"
Expand All @@ -76,17 +76,17 @@ jobs:

steps:
- name: "Checkout repository"
uses: "actions/[email protected].1"
uses: "actions/[email protected].3"

- name: "Install PHP"
uses: "shivammathur/setup-php@2.29.0"
uses: "shivammathur/setup-php@2.30.0"
with:
php-version: "latest"
extensions: "bcmath, ctype, gmp"
coverage: "none"

- name: "Install dependencies (Composer)"
uses: "ramsey/composer-install@2.2.0"
uses: "ramsey/composer-install@3.0.0"

- name: "Analyze security of code (Psalm)"
run: "./vendor/bin/psalm --taint-analysis --report=build/logs/psalm.sarif"
Expand All @@ -103,24 +103,24 @@ jobs:

steps:
- name: "Checkout repository"
uses: "actions/[email protected].1"
uses: "actions/[email protected].3"

- name: "Install PHP"
uses: "shivammathur/setup-php@2.29.0"
uses: "shivammathur/setup-php@2.30.0"
with:
php-version: "latest"
extensions: "bcmath, ctype, gmp"
coverage: "pcov"
ini-values: "memory_limit=-1"

- name: "Install dependencies (Composer)"
uses: "ramsey/composer-install@2.2.0"
uses: "ramsey/composer-install@3.0.0"

- name: "Run unit tests (PHPUnit)"
run: "composer dev:test:coverage:ci"

- name: "Publish coverage report to Codecov"
uses: "codecov/codecov-action@v4.0.1"
uses: "codecov/codecov-action@v4.1.1"

unit-tests:
name: "Unit tests"
Expand All @@ -139,17 +139,17 @@ jobs:

steps:
- name: "Checkout repository"
uses: "actions/[email protected].1"
uses: "actions/[email protected].3"

- name: "Install PHP"
uses: "shivammathur/setup-php@2.29.0"
uses: "shivammathur/setup-php@2.30.0"
with:
php-version: "${{ matrix.php }}"
extensions: "bcmath, ctype, gmp"
coverage: "none"

- name: "Install dependencies (Composer)"
uses: "ramsey/composer-install@2.2.0"
uses: "ramsey/composer-install@3.0.0"
with:
dependency-versions: "${{ matrix.composer-deps }}"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge-me.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- name: "Auto-merge"
if: ${{ github.event.workflow_run.conclusion == 'success' }}
uses: "ridedott/[email protected].66"
uses: "ridedott/[email protected].78"
with:
# This must be used as GitHub Actions token does not support pushing
# to protected branches.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"phpstan/phpstan-phpunit": "^1.3",
"phpunit/phpunit": "^9.5",
"psalm/plugin-mockery": "^1.1",
"psalm/plugin-phpunit": "^0.18.4",
"psalm/plugin-phpunit": "^0.19.0",
"ramsey/coding-standard": "^2.0.3",
"ramsey/conventional-commits": "^1.3",
"vimeo/psalm": "^5.4"
Expand Down

0 comments on commit df93365

Please sign in to comment.