Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 55 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ jobs:
- name: Run integration test suite
run: composer run-script integration

integration-tests-postgres:
name: PostgreSQL integration tests
integration-tests-postgres-14:
name: PostgreSQL integration tests (14)
needs: tests
services:
postgres:
Expand All @@ -93,6 +93,59 @@ jobs:
runs-on: "ubuntu-24.04"
timeout-minutes: 60

strategy:
fail-fast: false
matrix:
php:
- '7.4'
- '8.0'
- '8.1'

steps:
- uses: actions/checkout@v2

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

- uses: actions/create-github-app-token@v2 id: generate_token with: app-id: ${{ secrets.AUTOMATION_CLIENT_ID }} private-key: ${{ secrets.AUTOMATION_CLIENT_SECRET }} owner: ${{ github.repository_owner }}

is not needed here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Initially there was de8f501 but it left the PR after rebase. Other fixes to setup were not needed.


- name: Setup PHP Action
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none
extensions: pdo_pgsql, gd
tools: cs2pr

- uses: "ramsey/composer-install@v1"
with:
dependency-versions: "highest"

- name: Setup problem matchers for PHPUnit
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Run integration test suite vs Postgresql
run: composer run-script integration
env:
DATABASE_URL: "pgsql://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/testdb?server_version=10"
# Required by old repository tests
DATABASE: "pgsql://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/testdb"

integration-tests-postgres-18:
name: PostgreSQL integration tests (18)
needs: tests
services:
postgres:
image: postgres:18
ports:
- 5432
env:
POSTGRES_PASSWORD: postgres
POSTGRES_DB: testdb
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
--tmpfs /var/lib/postgres
runs-on: "ubuntu-24.04"
timeout-minutes: 60

strategy:
fail-fast: false
matrix:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public function getCriteriaForInitialData(): iterable
yield 'Sibling IN 2, 1]' => new Criterion\Sibling(2, 1);
yield 'Subtree=/1/2/' => new Criterion\Subtree('/1/2/');
yield '[email protected]' => new Criterion\UserEmail('[email protected]');
yield 'UserEmail=admin@*' => new Criterion\UserEmail('*@link.invalid', Criterion\Operator::LIKE);
yield 'UserEmail=admin@*' => new Criterion\UserEmail('admin@*', Criterion\Operator::LIKE);
yield 'UserId=14' => new Criterion\UserId(14);
yield 'UserLogin=admin' => new Criterion\UserLogin('admin');
yield 'UserLogin=a*' => new Criterion\UserLogin('a*', Criterion\Operator::LIKE);
Expand Down
Loading