Skip to content

Commit ba5fdfd

Browse files
committed
oracle tests work
1 parent 4f3d890 commit ba5fdfd

File tree

2 files changed

+13
-39
lines changed

2 files changed

+13
-39
lines changed

.github/workflows/dotnet.yml

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,19 @@ jobs:
3939
--health-timeout=5s
4040
--health-retries=5
4141
42-
# oracle:
43-
# image: gvenzl/oracle-xe:21.3.0-slim
44-
# ports:
45-
# - 1521:1521
46-
# env:
47-
# ORACLE_PASSWORD: testpass
48-
# options: >-
49-
# --health-cmd "echo 'exit' | sqlplus -L system/oracle@localhost/XEPDB1"
50-
# --health-interval=25s
51-
# --health-timeout=20s
52-
# --health-retries=20
42+
oracle:
43+
image: gvenzl/oracle-free:latest
44+
ports:
45+
- 1521:1521
46+
env:
47+
ORACLE_RANDOM_PASSWORD: true
48+
APP_USER: test
49+
APP_USER_PASSWORD: test
50+
options: >-
51+
--health-cmd healthcheck.sh
52+
--health-interval 10s
53+
--health-timeout 5s
54+
--health-retries 10
5355
5456
mysql:
5557
image: mysql:8.0
@@ -81,20 +83,6 @@ jobs:
8183
sudo ACCEPT_EULA=Y apt-get install -y mssql-tools unixodbc-dev
8284
echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc
8385
source ~/.bashrc
84-
# - name: Download and install Oracle SQLcl
85-
# run: |
86-
# curl -L -o sqlcl.zip https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-latest.zip
87-
# unzip sqlcl.zip -d sqlcl
88-
# echo "$PWD/sqlcl/sqlcl/bin" >> $GITHUB_PATH
89-
# - name: Run SQL script with Oracle SQLcl
90-
# run: |
91-
# echo "create user test identified by test;" > setup.sql
92-
# echo "grant connect, resource to test;" >> setup.sql
93-
# sql /nolog <<EOF
94-
# connect system/testpass@//localhost:1521/XEPDB1
95-
# @setup.sql
96-
# exit
97-
# EOF
9886
- name: Create SQLServer database
9987
run: |
10088
/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'YourStrong@Passw0rd' -Q "CREATE DATABASE [Whatever];"

.github/workflows/dotnetpull.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,6 @@ jobs:
8181
sudo ACCEPT_EULA=Y apt-get install -y mssql-tools unixodbc-dev
8282
echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc
8383
source ~/.bashrc
84-
# - name: Download and install Oracle SQLcl
85-
# run: |
86-
# curl -L -o sqlcl.zip https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-latest.zip
87-
# unzip sqlcl.zip -d sqlcl
88-
# echo "$PWD/sqlcl/sqlcl/bin" >> $GITHUB_PATH
89-
# - name: Run SQL script with Oracle SQLcl
90-
# run: |
91-
# echo "create user test identified by test;" > setup.sql
92-
# echo "grant connect, resource to test;" >> setup.sql
93-
# sql /nolog <<EOF
94-
# connect system/testpass@//localhost:1521/XEPDB1
95-
# @setup.sql
96-
# exit
97-
# EOF
9884
- name: Create SQLServer database
9985
run: |
10086
/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'YourStrong@Passw0rd' -Q "CREATE DATABASE [Whatever];"

0 commit comments

Comments
 (0)