Skip to content
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.

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

[pull] master from Kononnable:master #82

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 16 additions & 17 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,26 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [10.x, 12.x, 14.x, 15.x]
node-version: [12.x, 14.x, 16.x]

steps:
- name: Checkout the repo
uses: actions/checkout@v2

- name: Checkout the repo
uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Setup containers
run: docker-compose up -d mysql mariadb postgres mssql

- name: Setup containers
run: docker-compose up -d mysql mariadb postgres mssql
- name: Install dependencies
run: npm ci

- name: Install dependencies
run: npm ci
- name: Test
run: npm t

- name: Test
run: npm t

- name: Push coverage
if: github.ref == 'refs/heads/master'
uses: codecov/codecov-action@v1
- name: Push coverage
if: github.ref == 'refs/heads/master'
uses: codecov/codecov-action@v1
87 changes: 43 additions & 44 deletions .github/workflows/oracle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,62 +9,61 @@ on:
pull_request:

env:
ORACLE_Skip: 0
ORACLE_Host: localhost
ORACLE_Port: 1521
ORACLE_SSL: 0
ORACLE_UsernameSys: sys
ORACLE_PasswordSys: Oradoc_db1
ORACLE_Database: orclpdb1.localdomain
ORACLE_Username: typeorm_mg
ORACLE_Password: Passw0rd
ORACLE_Skip: 0
ORACLE_Host: localhost
ORACLE_Port: 1521
ORACLE_SSL: 0
ORACLE_UsernameSys: sys
ORACLE_PasswordSys: Oradoc_db1
ORACLE_Database: orclpdb1.localdomain
ORACLE_Username: typeorm_mg
ORACLE_Password: Passw0rd

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [10.x, 12.x, 14.x, 15.x]
node-version: [12.x, 14.x, 16.x]

steps:
- name: Login to registry
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_LOGIN }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Login to registry
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_LOGIN }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Checkout the repo
uses: actions/checkout@v2

- name: Checkout the repo
uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Setup containers
run: docker-compose up -d oracle oracle_client

- name: Setup containers
run: docker-compose up -d oracle oracle_client
- name: Install dependencies
run: npm ci

- name: Install dependencies
run: npm ci
- name: Setup oracle client
run: |
wget https://download.oracle.com/otn_software/linux/instantclient/195000/instantclient-basiclite-linux.x64-19.5.0.0.0dbru.zip
unzip instantclient-basiclite-linux.x64-19.5.0.0.0dbru.zip -d /tmp/oracle
wget https://download.oracle.com/otn_software/linux/instantclient/195000/instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip
unzip instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip -d /tmp/oracle
sudo sh -c "echo /tmp/oracle/instantclient_19_5 > /etc/ld.so.conf.d/oracle-instantclient.conf";sudo ldconfig
sh -c 'echo WHENEVER SQLERROR EXIT FAILURE > /tmp/user.sql; echo CREATE USER typeorm_mg IDENTIFIED BY Passw0rd\; >> /tmp/user.sql; echo GRANT CONNECT TO typeorm_mg\; >> /tmp/user.sql; echo GRANT UNLIMITED TABLESPACE TO typeorm_mg\; >> /tmp/user.sql; echo exit >> /tmp/user.sql'
sudo apt install libaio1
until /tmp/oracle/instantclient_19_5/sqlplus -L -S sys/Oradoc_db1@//localhost:1521/orclpdb1.localdomain as sysdba @/tmp/user.sql ; do echo waiting for oracle; sleep 10; done;
npm install oracledb --no-save

- name: Setup oracle client
run: |
wget https://download.oracle.com/otn_software/linux/instantclient/195000/instantclient-basiclite-linux.x64-19.5.0.0.0dbru.zip
unzip instantclient-basiclite-linux.x64-19.5.0.0.0dbru.zip -d /tmp/oracle
wget https://download.oracle.com/otn_software/linux/instantclient/195000/instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip
unzip instantclient-sqlplus-linux.x64-19.5.0.0.0dbru.zip -d /tmp/oracle
sudo sh -c "echo /tmp/oracle/instantclient_19_5 > /etc/ld.so.conf.d/oracle-instantclient.conf";sudo ldconfig
sh -c 'echo WHENEVER SQLERROR EXIT FAILURE > /tmp/user.sql; echo CREATE USER typeorm_mg IDENTIFIED BY Passw0rd\; >> /tmp/user.sql; echo GRANT CONNECT TO typeorm_mg\; >> /tmp/user.sql; echo GRANT UNLIMITED TABLESPACE TO typeorm_mg\; >> /tmp/user.sql; echo exit >> /tmp/user.sql'
sudo apt install libaio1
until /tmp/oracle/instantclient_19_5/sqlplus -L -S sys/Oradoc_db1@//localhost:1521/orclpdb1.localdomain as sysdba @/tmp/user.sql ; do echo waiting for oracle; sleep 10; done;
npm install oracledb --no-save
- name: Test
run: npm t
env:
LD_LIBRARY_PATH: /tmp/oracle/instantclient_19_5

- name: Test
run: npm t
env:
LD_LIBRARY_PATH: /tmp/oracle/instantclient_19_5

- name: Push coverage
if: github.ref == 'refs/heads/master'
uses: codecov/codecov-action@v1
- name: Push coverage
if: github.ref == 'refs/heads/master'
uses: codecov/codecov-action@v1
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 0.4.6
* Fix typecasting problem when using old version mysql (#326)
* Update dependencies

## 0.4.5
* **typeorm-model-generator enters maintenance phase (#329)**
* Fix oracle driver to work with latest version of typeorm (#328)
Expand Down
Loading