Skip to content

fix(deps): Deprecate functionality deprecated by doctrine and test on more oracle versions #46605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 14 commits into from
Jul 19, 2024
Merged

fix(deps): Deprecate functionality deprecated by doctrine and test on more oracle versions #46605

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5c02303
ci(oracle): Test against Oracle 11, 18, 21 and 23
nickvergessen Jul 18, 2024
f92352e
fix(db): Deprecate `getQueryPart()` and `resetQueryPart()` methods th…
nickvergessen Jul 18, 2024
a4c1d72
fix(db): Use `createSchemaManager()` method as `getSchemaManager()` i…
nickvergessen Jun 28, 2024
11e84b8
fix(db): Fix internal calls to doctrine's `fetch()` methods
nickvergessen Jun 28, 2024
c84580d
fix(db): `Doctrine\DBAL\Connection::executeUpdate()` is deprecated
nickvergessen Jul 1, 2024
e9bfaf3
fix(db): Don't use deprecated 3rdparty constant: `Doctrine\DBAL\Conne…
nickvergessen Jul 1, 2024
bd38362
fix(db): Deprecate using table alias for DELETE and UPDATE
nickvergessen Jul 1, 2024
829f2b9
fix(db): Promote the use of `getDatabaseProvider` to reduce the impag…
nickvergessen Jul 1, 2024
e454657
fix(db): Deprecate `getState()` as per upstream
nickvergessen Jul 1, 2024
eeb6ddb
fix(db): Deprecate `IExpressionBuilder::or()` and `IExpressionBuilder…
nickvergessen Jul 4, 2024
e1e4ee4
fix(db): Manually track if `where()` is called when not empty to avoi…
nickvergessen Jul 18, 2024
f6238d3
fix(test): Make the test less flaky
nickvergessen Jul 19, 2024
817ca00
ci: Run all Oracle versions all the time
nickvergessen Jul 19, 2024
b656edc
fix(db): Fix md5 for oracle >= 20
nickvergessen Jul 19, 2024
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
Next Next commit
ci(oracle): Test against Oracle 11, 18, 21 and 23 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Jul 19, 2024
commit 5c02303ce41ac7f13a1504bcc6e8c0e75f525f61
29 changes: 15 additions & 14 deletions .github/workflows/phpunit-oci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,20 @@ jobs:
runs-on: ubuntu-latest

needs: changes
if: needs.changes.outputs.src != 'false' && ${{ github.repository_owner != 'nextcloud-gmbh' }}
if: ${{ needs.changes.outputs.src != 'false' && github.repository_owner != 'nextcloud-gmbh' }}

strategy:
matrix:
oracle-versions: ['11']
php-versions: ['8.1', '8.2', '8.3']
include:
- php-versions: '8.3'
- oracle-versions: '11'
php-versions: '8.1'
- oracle-versions: '18'
php-versions: '8.1'
coverage: ${{ github.event_name != 'pull_request' }}
- oracle-versions: '21'
php-versions: '8.2'
- oracle-versions: '23'
php-versions: '8.3'

name: Oracle ${{ matrix.oracle-versions }} (PHP ${{ matrix.php-versions }}) - database tests

Expand All @@ -71,23 +76,21 @@ jobs:
options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3

oracle:
image: ghcr.io/gvenzl/oracle-xe:${{ matrix.oracle-versions }}
image: ghcr.io/gvenzl/oracle-${{ matrix.oracle-versions < 23 && 'xe' || 'free' }}:${{ matrix.oracle-versions }}

# Provide passwords and other environment variables to container
env:
ORACLE_RANDOM_PASSWORD: true
APP_USER: oc_autotest
APP_USER_PASSWORD: nextcloud
ORACLE_PASSWORD: oracle

# Forward Oracle port
ports:
- 4444:1521/tcp
- 1521:1521

# Provide healthcheck script options for startup
options: >-
--health-cmd healthcheck.sh
--health-interval 10s
--health-timeout 5s
--health-interval 20s
--health-timeout 10s
--health-retries 10

steps:
Expand All @@ -111,13 +114,11 @@ jobs:
run: composer i

- name: Set up Nextcloud
env:
DB_PORT: 4444
run: |
mkdir data
cp tests/redis.config.php config/
cp tests/preseed-config.php config/config.php
./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=oc_autotest --database-pass=nextcloud --admin-user admin --admin-pass admin
./occ maintenance:install --verbose --database=oci --database-name=${{ matrix.oracle-versions < 23 && 'XE' || 'FREE' }} --database-host=127.0.0.1 --database-port=1521 --database-user=system --database-pass=oracle --admin-user admin --admin-pass admin
php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0

- name: PHPUnit
Expand Down