Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
konchunas authored Jul 1, 2022
2 parents cfa95d8 + 4a41044 commit caf1835
Show file tree
Hide file tree
Showing 160 changed files with 5,021 additions and 2,570 deletions.
15 changes: 0 additions & 15 deletions .coveragerc

This file was deleted.

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ about: Create a report to help us improve
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior, preferaby a small code snippet.
Steps to reproduce the behavior, preferably a small code snippet.

**Expected behavior**
A clear and concise description of what you expected to happen.
Expand Down
33 changes: 29 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,42 @@ jobs:
runs-on: ubuntu-latest
services:
postgres:
image: postgres:latest
image: postgres
ports:
- 5432:5432
env:
POSTGRES_PASSWORD: 123456
POSTGRES_USER: postgres
options: --health-cmd=pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
mysql:
image: mysql
ports:
- 3306:3306
env:
MYSQL_ROOT_PASSWORD: 123456
options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 5
mssql:
image: mcr.microsoft.com/mssql/server:2019-CU15-ubuntu-20.04
ports:
- 1433:1433
env:
ACCEPT_EULA: Y
SA_PASSWORD: Abcd12345678
options: >-
--health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P Abcd12345678 -Q 'select 1' -b -o /dev/null"
--health-interval 10s
--health-timeout 5s
--health-retries 5
env:
TORTOISE_TEST_MODULES: tests.testmodels
TORTOISE_MYSQL_PASS: root
TORTOISE_MYSQL_PASS: 123456
TORTOISE_POSTGRES_PASS: 123456
TORTOISE_MSSQL_PASS: Abcd12345678
TORTOISE_MSSQL_DRIVER: ODBC Driver 18 for SQL Server
strategy:
matrix:
python-version: [ "3.8", "3.9", "3.10" ]
steps:
- name: Start MySQL
run: sudo systemctl start mysql.service
- uses: actions/cache@v2
with:
path: ~/.cache/pip
Expand All @@ -44,6 +63,12 @@ jobs:
poetry config virtualenvs.create false
- name: Install requirements
run: make deps
- name: Install ODBC driver
run: |
sudo curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
sudo curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list -o /etc/apt/sources.list.d/mssql-release.list
sudo apt-get update
ACCEPT_EULA=Y sudo apt-get install -y msodbcsql18
- name: Run ci
run: make ci
- name: Upload Coverage
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: codespell
on: [pull_request, push]
jobs:
codespell:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- run: pip install codespell
- run: codespell
27 changes: 27 additions & 0 deletions .github/workflows/gh-pages-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: gh-pages-release
on:
release:
types:
- created
jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.9"
- name: Install and configure Poetry
run: |
pip install -U pip poetry
poetry config virtualenvs.create false
- name: Build docs
run: make docs
- name: Deploy release docs
uses: peaceiris/actions-gh-pages@v3
with:
personal_token: ${{ secrets.PERSONAL_TOKEN }}
publish_dir: build/html
external_repository: tortoise/tortoise.github.io
publish_branch: master
destination_dir: ${{ github.ref_name }}
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- develop
jobs:
gh-pages:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand All @@ -17,7 +17,7 @@ jobs:
poetry config virtualenvs.create false
- name: Build docs
run: make docs
- name: Deploy docs
- name: Deploy latest docs
uses: peaceiris/actions-gh-pages@v3
with:
personal_token: ${{ secrets.PERSONAL_TOKEN }}
Expand Down
Loading

0 comments on commit caf1835

Please sign in to comment.