Test /w Oracle 18g (#89)

atk4 · Jan 22, 2022 · 35dfaf3 · 35dfaf3
1 parent 60e4988
commit 35dfaf3
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -104,9 +104,10 @@ jobs:
           ACCEPT_EULA: Y
           SA_PASSWORD: atk4_pass
       oracle:
-        image: ghcr.io/mvorisek/docker-oracle-xe-11g
+        image: gvenzl/oracle-xe:18
         env:
-          ORACLE_ALLOW_REMOTE: true
+          ORACLE_PASSWORD: atk4_pass
+        options: --health-cmd healthcheck.sh --health-interval=10s --health-timeout=5s --health-retries=10
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -196,12 +197,11 @@ jobs:
           php -d opcache.enable_cli=1 vendor/bin/phpunit --exclude-group none $(if [ -n "$LOG_COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi) -v
           if [ -n "$LOG_COVERAGE" ]; then mv coverage/phpunit.cov coverage/phpunit-mssql.cov; fi
 
-      - name: "Run tests: Oracle (only for coverage or cron)"
-        if: env.LOG_COVERAGE || github.event_name == 'schedule'
+      - name: "Run tests: Oracle"
         env:
           DB_DSN: "oci:dbname=oracle/xe"
           DB_USER: system
-          DB_PASSWORD: oracle
+          DB_PASSWORD: atk4_pass
           NLS_LANG: AMERICAN_AMERICA.AL32UTF8
         run: |
           sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
@@ -259,9 +259,10 @@ jobs:
           ACCEPT_EULA: Y
           SA_PASSWORD: atk4_pass
       oracle:
-        image: ghcr.io/mvorisek/docker-oracle-xe-11g
+        image: gvenzl/oracle-xe:18
         env:
-          ORACLE_ALLOW_REMOTE: true
+          ORACLE_PASSWORD: atk4_pass
+        options: --health-cmd healthcheck.sh --health-interval=10s --health-timeout=5s --health-retries=10
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -382,7 +383,7 @@ jobs:
         env:
           DB_DSN: "oci:dbname=oracle/xe"
           DB_USER: system
-          DB_PASSWORD: oracle
+          DB_PASSWORD: atk4_pass
           NLS_LANG: AMERICAN_AMERICA.AL32UTF8
         run: |
           sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php