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

Migrate to TypeScript version 3, fix MariaDB tests & use Github Actions #557

Merged
merged 13 commits into from
Oct 25, 2019
Merged
53 changes: 50 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,47 @@ jobs:
matrix:
node-version: [8.x, 10.x]

services:
mysql:
image: mysql:5.7.10
ports:
# Another version of MySQL is installed on the vm and already uses the port 3306.
- 3308:3306
env:
MYSQL_ROOT_PASSWORD: admin
MYSQL_USER: test
MYSQL_PASSWORD: test
MYSQL_DATABASE: test

mariadb:
image: mariadb:10.1.16
ports:
- 3307:3306
env:
MYSQL_ROOT_PASSWORD: admin
MYSQL_USER: test
MYSQL_PASSWORD: test
MYSQL_DATABASE: test

postgres:
image: postgres:9.6.1
ports:
- 5432:5432
env:
POSTGRES_USER: test
POSTGRES_PASSWORD: test
POSTGRES_DB: test

mongodb:
image: mongo:3.4.1
ports:
- 27017:27017

redis:
image: redis:4.0.14
ports:
- 6379:6379

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
Expand All @@ -22,12 +63,18 @@ jobs:
- name: Install project dependencies
run: npm install
- name: Install package dependencies and build packages
run: |
lerna bootstrap
cd packages/cli && npm link && cd ../..
run: lerna bootstrap
- name: Create CLI symlink in the global folder
run: npm link
working-directory: packages/cli
- name: Check package linting
run: npm run lint
- name: Run unit and acceptance tests (TypeScript)
run: lerna run --no-bail test
- name: Run acceptance tests (Bash)
run: ./e2e_test.sh
- name: Send code coverage report to Codecov
uses: codecov/codecov-action@v1.0.3
with:
token: ${{secrets.CODECOV_TOKEN}}
file: packages/core/coverage/*.json
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ services:
mysql:
image: "mysql:5.7.10"
ports:
- "3306:3306"
# Another version of MySQL is installed on the vm and already uses the port 3306.
- "3308:3306"
environment:
MYSQL_ROOT_PASSWORD: "admin"
MYSQL_USER: "test"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"lerna": "^2.11.0",
"mocha": "^4.1.0",
"tslint": "^5.11.0",
"typescript": "^2.9.2"
"typescript": "~3.5.3"
}
}
49 changes: 15 additions & 34 deletions packages/acceptance-tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/acceptance-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"supertest": "^3.3.0",
"ts-node": "^3.3.0",
"typeorm": "^0.2.14",
"typescript": "^2.5.2",
"typescript": "~3.5.3",
"yamljs": "^0.3.0"
}
}
8 changes: 4 additions & 4 deletions packages/cli/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@
"mocha": "^5.2.0",
"rimraf": "^2.6.2",
"ts-node": "^3.3.0",
"typescript": "^2.5.2"
"typescript": "~3.5.3"
}
}
12 changes: 5 additions & 7 deletions packages/core/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"twig": "^1.13.3",
"typedoc": "^0.14.2",
"typedoc-plugin-markdown": "^1.2.0",
"typescript": "^2.5.2",
"typescript": "~3.5.3",
"yamljs": "^0.3.0"
}
}
8 changes: 4 additions & 4 deletions packages/csrf/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/csrf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"ts-node": "^3.3.0",
"typedoc": "^0.14.2",
"typedoc-plugin-markdown": "^1.2.0",
"typescript": "^2.5.2"
"typescript": "~3.5.3"
},
"dependencies": {
"@foal/core": "^1.2.0"
Expand Down
Loading