Skip to content

Commit

Permalink
Merge pull request #339 from waketzheng/update-ci
Browse files Browse the repository at this point in the history
Update ci action versions and avoid `make ci` install deps twice
  • Loading branch information
long2ice authored Jun 6, 2024
2 parents f3b6f8f + aee706e commit 4a1fc4c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
steps:
- name: Start MySQL
run: sudo systemctl start mysql.service
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install and configure Poetry
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install and configure Poetry
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

**Upgrade note:**
1. Use column name as unique key name for mysql
2. Drop support for Python3.7

## 0.7

Expand Down
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ up:
deps:
@poetry install -E asyncpg -E asyncmy

style: deps
_style:
@isort -src $(checkfiles)
@black $(black_opts) $(checkfiles)
style: deps _style

check: deps
_check:
@black --check $(black_opts) $(checkfiles) || (echo "Please run 'make style' to auto-fix style issues" && false)
@ruff check $(checkfiles)
check: deps _check

test: deps
$(py_warn) TEST_DB=sqlite://:memory: py.test
Expand All @@ -34,9 +36,10 @@ test_mysql:
test_postgres:
$(py_warn) TEST_DB="postgres://postgres:$(POSTGRES_PASS)@$(POSTGRES_HOST):$(POSTGRES_PORT)/test_\{\}" pytest -vv -s

testall: deps test_sqlite test_postgres test_mysql
_testall: test_sqlite test_postgres test_mysql
testall: deps _test_all

build: deps
@poetry build

ci: check testall
ci: check _testall

0 comments on commit 4a1fc4c

Please sign in to comment.