From 20785b2eb36c5c7cb686baf748204faf9352b026 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Sat, 20 May 2023 19:53:07 +0900 Subject: [PATCH 1/6] CI: Add build using libmariadb-dev --- .github/workflows/tests.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 31ee34d3..af9f6bbd 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -10,7 +10,14 @@ jobs: strategy: matrix: python-version: ["3.8", "3.9", "3.10", "3.11"] + include: + - python-version: "3.11" + mariadbclient: 1 steps: + - if: ${{ matrix.mariadbclient }} + run: | + sudo apt-get install libmariadb-dev + - name: Start MySQL run: | sudo systemctl start mysql.service From d4113c2c1656f74d1eb47b0d6cdb0aa5b56b3cd7 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Sun, 21 May 2023 01:18:58 +0900 Subject: [PATCH 2/6] Use MariaDB Server too --- .github/workflows/tests.yaml | 21 ++++++++++++++++----- Makefile | 1 - 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index af9f6bbd..941dff2a 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -1,7 +1,7 @@ name: Test on: - push: + push: ["main"] pull_request: jobs: @@ -12,15 +12,26 @@ jobs: python-version: ["3.8", "3.9", "3.10", "3.11"] include: - python-version: "3.11" - mariadbclient: 1 + mariadb: 1 steps: - - if: ${{ matrix.mariadbclient }} + - if: ${{ matrix.mariadb }} + name: Start MariaDB + # https://github.com/actions/runner-images/blob/9d9b3a110dfc98100cdd09cb2c957b9a768e2979/images/linux/scripts/installers/mysql.sh#L10-L13 run: | - sudo apt-get install libmariadb-dev + export DEBIAN_FRONTEND=noninteractive + echo mariadb-server mariadb-server/root_password password root | sudo debconf-set-selections + echo mariadb-server mariadb-server/root_password_again password root | sudo debconf-set-selections + sudo apt-get -y install mariadb-server libmariadb-dev + sudo systemctl start mariadb.service + mysql --version + mysql -uroot -proot -e "CREATE DATABASE mysqldb_test" + - - name: Start MySQL + - if: ${{ !matrix.mariadb }} + name: Start MySQL run: | sudo systemctl start mysql.service + mysql --version mysql -uroot -proot -e "CREATE DATABASE mysqldb_test" - uses: actions/checkout@v3 diff --git a/Makefile b/Makefile index bcd4334d..3f9ff8bb 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,6 @@ doc: .PHONY: clean clean: - python setup.py clean find . -name '*.pyc' -delete find . -name '__pycache__' -delete rm -rf build From 8ff54bdf5425c221293dff47cbe94e6f7a8906cd Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Sun, 21 May 2023 01:22:51 +0900 Subject: [PATCH 3/6] fixup --- .github/workflows/tests.yaml | 3 ++- ci/django-requirements.txt | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 ci/django-requirements.txt diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 941dff2a..a9655a4a 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -1,7 +1,8 @@ name: Test on: - push: ["main"] + push: + branches: ["main"] pull_request: jobs: diff --git a/ci/django-requirements.txt b/ci/django-requirements.txt new file mode 100644 index 00000000..83c8a8f2 --- /dev/null +++ b/ci/django-requirements.txt @@ -0,0 +1,24 @@ +# django-3.2.19/tests/requirements/py3.txt +aiosmtpd +asgiref >= 3.3.2 +argon2-cffi >= 16.1.0 +backports.zoneinfo; python_version < '3.9' +bcrypt +docutils +geoip2 +jinja2 >= 2.9.2 +numpy +Pillow >= 6.2.0 +# pylibmc/libmemcached can't be built on Windows. +pylibmc; sys.platform != 'win32' +pymemcache >= 3.4.0 +# RemovedInDjango41Warning. +python-memcached >= 1.59 +pytz +pywatchman; sys.platform != 'win32' +PyYAML +selenium +sqlparse >= 0.2.2 +tblib >= 1.5.0 +tzdata +colorama; sys.platform == 'win32' From 17897ed3dc023e6f1633e529b24128224285bac7 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Sun, 21 May 2023 01:43:46 +0900 Subject: [PATCH 4/6] Use docker to start mariadb in CI --- .github/workflows/tests.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a9655a4a..6f1004ff 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -19,14 +19,10 @@ jobs: name: Start MariaDB # https://github.com/actions/runner-images/blob/9d9b3a110dfc98100cdd09cb2c957b9a768e2979/images/linux/scripts/installers/mysql.sh#L10-L13 run: | - export DEBIAN_FRONTEND=noninteractive - echo mariadb-server mariadb-server/root_password password root | sudo debconf-set-selections - echo mariadb-server mariadb-server/root_password_again password root | sudo debconf-set-selections - sudo apt-get -y install mariadb-server libmariadb-dev - sudo systemctl start mariadb.service + docker run -d -e MARIADB_ROOT_PASSWORD=root -p 3306:3306 --rm --name mariadb mariadb:11.0 + sudo apt-get -y install libmariadb-dev mysql --version - mysql -uroot -proot -e "CREATE DATABASE mysqldb_test" - + mysql -uroot -proot -h127.0.0.1 -e "CREATE DATABASE mysqldb_test" - if: ${{ !matrix.mariadb }} name: Start MySQL From 1ec56e64d42e0167feb0771337625e9b742ed725 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Sun, 21 May 2023 01:45:36 +0900 Subject: [PATCH 5/6] Add docker pull mariadb:11.0 --- .github/workflows/tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 6f1004ff..84d06788 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -19,6 +19,7 @@ jobs: name: Start MariaDB # https://github.com/actions/runner-images/blob/9d9b3a110dfc98100cdd09cb2c957b9a768e2979/images/linux/scripts/installers/mysql.sh#L10-L13 run: | + docker pull mariadb:11.0 docker run -d -e MARIADB_ROOT_PASSWORD=root -p 3306:3306 --rm --name mariadb mariadb:11.0 sudo apt-get -y install libmariadb-dev mysql --version From 16cebd6ebbf48cdf9731733b516323245c49804f Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Sun, 21 May 2023 01:47:56 +0900 Subject: [PATCH 6/6] Use MariaDB 10.11. --- .github/workflows/tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 84d06788..743f1eb3 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -19,8 +19,8 @@ jobs: name: Start MariaDB # https://github.com/actions/runner-images/blob/9d9b3a110dfc98100cdd09cb2c957b9a768e2979/images/linux/scripts/installers/mysql.sh#L10-L13 run: | - docker pull mariadb:11.0 - docker run -d -e MARIADB_ROOT_PASSWORD=root -p 3306:3306 --rm --name mariadb mariadb:11.0 + docker pull mariadb:10.11 + docker run -d -e MARIADB_ROOT_PASSWORD=root -p 3306:3306 --rm --name mariadb mariadb:10.11 sudo apt-get -y install libmariadb-dev mysql --version mysql -uroot -proot -h127.0.0.1 -e "CREATE DATABASE mysqldb_test"