Skip to content

Commit

Permalink
IBX-8119: Upgraded minimum PHP version to 8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Steveb-p authored and barw4 committed Oct 17, 2024
1 parent e570cf8 commit 77145c3
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 37 deletions.
58 changes: 25 additions & 33 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ on:
jobs:
cs-fix:
name: Run code style check
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"
strategy:
matrix:
php:
- '8.0'
- '8.3'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup PHP Action
uses: shivammathur/setup-php@v2
Expand All @@ -26,28 +26,26 @@ jobs:
extensions: 'pdo_sqlite, gd'
tools: cs2pr

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

- name: Run code style check
run: composer run-script check-cs -- --format=checkstyle | cs2pr

tests:
name: Unit tests & SQLite integration tests
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"
timeout-minutes: 15

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

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup PHP Action
uses: shivammathur/setup-php@v2
Expand All @@ -57,9 +55,9 @@ jobs:
extensions: pdo_sqlite, gd
tools: cs2pr

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

- name: Setup problem matchers for PHPUnit
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
Expand Down Expand Up @@ -90,19 +88,17 @@ jobs:
--health-timeout 5s
--health-retries 5
--tmpfs /var/lib/postgres
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"
timeout-minutes: 60

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

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup PHP Action
uses: shivammathur/setup-php@v2
Expand All @@ -112,9 +108,9 @@ jobs:
extensions: pdo_pgsql, gd
tools: cs2pr

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

- name: Setup problem matchers for PHPUnit
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
Expand Down Expand Up @@ -145,19 +141,17 @@ jobs:
--health-timeout=5s
--health-retries=5
--tmpfs=/var/lib/mysql
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"
timeout-minutes: 60

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

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup PHP Action
uses: shivammathur/setup-php@v2
Expand All @@ -167,9 +161,9 @@ jobs:
extensions: pdo_mysql, gd, redis
tools: cs2pr

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

- name: Setup problem matchers for PHPUnit
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
Expand All @@ -182,7 +176,7 @@ jobs:

solr-integration:
name: "Solr integration tests"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"
timeout-minutes: 30
permissions:
packages: read
Expand All @@ -207,11 +201,9 @@ jobs:
fail-fast: false
matrix:
php:
- '7.4'
- '8.0'
- '8.1'
- '8.3'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -226,9 +218,9 @@ jobs:
VERSION=$(jq -r '.extra | ."branch-alias" | ."dev-main"' < composer.json)
composer require --no-update "ibexa/solr:$VERSION"
- uses: "ramsey/composer-install@v1"
- uses: ramsey/composer-install@v3
with:
dependency-versions: "highest"
dependency-versions: highest

- name: Run integration test suite
run: composer test-integration-solr
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/gha-docker-solr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:

jobs:
build-and-publish:
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"
permissions:
packages: write
services:
Expand Down Expand Up @@ -50,9 +50,9 @@ jobs:
VERSION=$(jq -r '.extra | ."branch-alias" | ."dev-main"' < composer.json)
composer require --no-update "ibexa/solr:$VERSION"
- uses: "ramsey/composer-install@v2"
- uses: ramsey/composer-install@v3
with:
dependency-versions: "highest"
dependency-versions: highest

- name: Run integration test suite
run: composer test-integration-solr
Expand All @@ -71,4 +71,3 @@ jobs:

- name: Push image
run: docker push "$IMAGE_NAME"

0 comments on commit 77145c3

Please sign in to comment.