Skip to content

Commit 1d770b0

Browse files
committed
ci: adjust OCI testing use 12c instead of 11g
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent 98d731d commit 1d770b0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.github/workflows/phpunit-oci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
fail-fast: false
5858
matrix:
5959
include:
60-
- oracle-versions: '11'
60+
- oracle-versions: '12'
6161
php-versions: '8.1'
6262
- oracle-versions: '18'
6363
php-versions: '8.1'
@@ -79,19 +79,20 @@ jobs:
7979
options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
8080

8181
oracle:
82-
image: ghcr.io/gvenzl/oracle-${{ matrix.oracle-versions < 23 && 'xe' || 'free' }}:${{ matrix.oracle-versions }}
82+
image: ${{ matrix.oracle-versions == 12 && 'quay.io/maksymbilenko/oracle-12c' || format('ghcr.io/gvenzl/oracle-{0}:{1}', matrix.oracle-versions < 23 && 'xe' || 'free', matrix.oracle-versions) }}
8383

8484
# Provide passwords and other environment variables to container
8585
env:
8686
ORACLE_PASSWORD: oracle
87+
ORACLE_ALLOW_REMOTE: true
8788

8889
# Forward Oracle port
8990
ports:
9091
- 1521:1521
9192

9293
# Provide healthcheck script options for startup
9394
options: >-
94-
--health-cmd healthcheck.sh
95+
--health-cmd ${{ matrix.oracle-versions > 12 && 'healthcheck.sh' || '"echo \"select * from v\$database;\" | sqlplus -S sys/oracle as sysdba || exit 1"' }}
9596
--health-interval 20s
9697
--health-timeout 10s
9798
--health-retries 10
@@ -121,7 +122,7 @@ jobs:
121122
mkdir data
122123
cp tests/redis.config.php config/
123124
cp tests/preseed-config.php config/config.php
124-
./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
125+
./occ maintenance:install --verbose --database=oci --database-name=${{ matrix.oracle-versions == 12 && 'xe' || (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
125126
php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
126127
127128
- name: PHPUnit

0 commit comments

Comments
 (0)