Skip to content

Commit c6277d2

Browse files
authored
Merge pull request #619 from liangliangyy/dev
update github actions
2 parents e3db657 + 231f5d6 commit c6277d2

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

.dockerignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ djangoblog/whoosh_index/
88
uploads/
99
settings_production.py
1010
*.md
11-
docs/
11+
docs/
12+
logs/

.github/workflows/django.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
max-parallel: 4
2828
matrix:
29-
python-version: [ 3.8, 3.9 ]
29+
python-version: [ "3.8", "3.9","3.10" ]
3030

3131
steps:
3232
- name: Start MySQL
@@ -66,7 +66,7 @@ jobs:
6666
strategy:
6767
max-parallel: 4
6868
matrix:
69-
python-version: [ 3.8, 3.9 ]
69+
python-version: [ "3.8", "3.9","3.10" ]
7070

7171
steps:
7272
- name: Start MySQL

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ coverage.xml
5050

5151
# Django stuff:
5252
*.log
53+
logs/
5354

5455
# Sphinx documentation
5556
docs/_build/

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3
1+
FROM python:3.10
22
ENV PYTHONUNBUFFERED 1
33
WORKDIR /code/djangoblog/
44
RUN apt-get install default-libmysqlclient-dev -y && \

docker-compose.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ services:
44
db:
55
image: mysql:latest
66
restart: always
7-
command:
8-
- mysqld
9-
- --max_connections=3000
10-
- --wait_timeout=600
11-
- --interactive_timeout=600
12-
- --thread_cache_size=50
13-
- --default-authentication-plugin=mysql_native_password
14-
- --character-set-server=utf8
15-
- --collation-server=utf8_general_ci
7+
# command:
8+
# - mysqld
9+
# - --max_connections=3000
10+
# - --wait_timeout=600
11+
# - --interactive_timeout=600
12+
# - --thread_cache_size=50
13+
# - --default-authentication-plugin=mysql_native_password
14+
# - --character-set-server=utf8
15+
# - --collation-server=utf8_general_ci
1616
environment:
1717
- MYSQL_DATABASE=djangoblog
1818
- MYSQL_ROOT_PASSWORD=DjAnGoBlOg!2!Q@W#E

0 commit comments

Comments
 (0)