Skip to content

Commit 4a409e4

Browse files
techousetechouse
authored
👷 update CI (#82)
1 parent a84c990 commit 4a409e4

File tree

4 files changed

+55
-45
lines changed

4 files changed

+55
-45
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,16 @@ jobs:
1313
analyze:
1414
name: Analyze
1515
runs-on: ubuntu-latest
16-
1716
strategy:
1817
fail-fast: false
1918
matrix:
2019
language: [ 'python' ]
21-
2220
steps:
2321
- name: Checkout repository
2422
uses: actions/checkout@v3
25-
2623
- name: Initialize CodeQL
2724
uses: github/codeql-action/init@v2
2825
with:
2926
languages: ${{ matrix.language }}
30-
3127
- name: Perform CodeQL Analysis
3228
uses: github/codeql-action/analyze@v2

‎.github/workflows/publish.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,14 @@ jobs:
3737
- name: Install build dependencies
3838
id: install_build_dependencies
3939
run: |
40+
set -e
4041
python3 -m pip install --upgrade pip
4142
pip install build setuptools wheel
4243
- name: Build a binary wheel and a source tarball
4344
id: build
44-
run: python3 -m build --sdist --wheel --outdir dist/ .
45+
run: |
46+
set -e
47+
python3 -m build --sdist --wheel --outdir dist/ .
4548
- name: Publish distribution package to Test PyPI
4649
id: publish_test
4750
uses: pypa/gh-action-pypi-publish@release/v1

‎.github/workflows/test.yml

Lines changed: 51 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v3
2020
- name: Set up Python
21-
uses: actions/setup-python@v3
21+
uses: actions/setup-python@v4
2222
with:
2323
python-version: "3.x"
2424
- name: Install dependencies
@@ -30,6 +30,7 @@ jobs:
3030
test:
3131
needs: analyze
3232
runs-on: ubuntu-latest
33+
environment: test
3334
strategy:
3435
matrix:
3536
include:
@@ -422,9 +423,7 @@ jobs:
422423
legacy_db: 0
423424
experimental: false
424425
py: "3.11"
425-
426426
continue-on-error: ${{ matrix.experimental }}
427-
428427
services:
429428
mysql:
430429
image: "${{ matrix.db }}"
@@ -433,68 +432,87 @@ jobs:
433432
env:
434433
MYSQL_ALLOW_EMPTY_PASSWORD: yes
435434
options: "--name=mysqld"
436-
437435
steps:
438436
- uses: actions/checkout@v3
439437
- name: Set up Python ${{ matrix.py }}
440438
uses: actions/setup-python@v4
441439
with:
442440
python-version: ${{ matrix.py }}
443-
444441
- uses: actions/cache@v3
445442
with:
446443
path: ~/.cache/pip
447444
key: ${{ runner.os }}-pip-1
448445
restore-keys: |
449446
${{ runner.os }}-pip-
450-
451447
- name: Install dependencies
452448
run: |
453449
python -m pip install --upgrade pip
454450
python -m pip install -U codecov tox-gh-actions
455451
pip install -r requirements_dev.txt
456-
457452
- name: Set up MySQL
458453
env:
459454
DB: ${{ matrix.db }}
455+
MYSQL_USER: ${{ secrets.MYSQL_USER }}
456+
MYSQL_PASSWORD: ${{ secrets.MYSQL_PASSWORD }}
457+
MYSQL_DATABASE: ${{ vars.MYSQL_DATABASE }}
458+
MYSQL_HOST: ${{ vars.MYSQL_HOST }}
459+
MYSQL_PORT: ${{ vars.MYSQL_PORT }}
460460
run: |
461+
set -e
461462
while :
462463
do
463-
sleep 1
464-
mysql -h127.0.0.1 -uroot -e 'select version()' && break
464+
sleep 1
465+
mysql -h127.0.0.1 -uroot -e 'select version()' && break
465466
done
466-
if [ $DB == 'mysql:8.0' ]; then
467-
WITH_PLUGIN='with mysql_native_password'
468-
mysql -h127.0.0.1 -uroot -e "SET GLOBAL local_infile=on"
469-
docker cp mysqld:/var/lib/mysql/public_key.pem "${HOME}"
470-
docker cp mysqld:/var/lib/mysql/ca.pem "${HOME}"
471-
docker cp mysqld:/var/lib/mysql/server-cert.pem "${HOME}"
472-
docker cp mysqld:/var/lib/mysql/client-key.pem "${HOME}"
473-
docker cp mysqld:/var/lib/mysql/client-cert.pem "${HOME}"
474-
mysql -uroot -h127.0.0.1 -e '
475-
CREATE USER
476-
user_sha256 IDENTIFIED WITH "sha256_password" BY "pass_sha256",
477-
nopass_sha256 IDENTIFIED WITH "sha256_password",
478-
user_caching_sha2 IDENTIFIED WITH "caching_sha2_password" BY "pass_caching_sha2",
479-
nopass_caching_sha2 IDENTIFIED WITH "caching_sha2_password"
480-
PASSWORD EXPIRE NEVER;'
481-
mysql -uroot -h127.0.0.1 -e 'GRANT RELOAD ON *.* TO user_caching_sha2;'
467+
if [ "$DB" == 'mysql:8.0' ]; then
468+
WITH_PLUGIN='with mysql_native_password'
469+
mysql -h127.0.0.1 -uroot -e "SET GLOBAL local_infile=on"
470+
docker cp mysqld:/var/lib/mysql/public_key.pem "${HOME}"
471+
docker cp mysqld:/var/lib/mysql/ca.pem "${HOME}"
472+
docker cp mysqld:/var/lib/mysql/server-cert.pem "${HOME}"
473+
docker cp mysqld:/var/lib/mysql/client-key.pem "${HOME}"
474+
docker cp mysqld:/var/lib/mysql/client-cert.pem "${HOME}"
475+
mysql -uroot -h127.0.0.1 -e '
476+
CREATE USER
477+
user_sha256 IDENTIFIED WITH "sha256_password" BY "pass_sha256",
478+
nopass_sha256 IDENTIFIED WITH "sha256_password",
479+
user_caching_sha2 IDENTIFIED WITH "caching_sha2_password" BY "pass_caching_sha2",
480+
nopass_caching_sha2 IDENTIFIED WITH "caching_sha2_password"
481+
PASSWORD EXPIRE NEVER;'
482+
mysql -uroot -h127.0.0.1 -e 'GRANT RELOAD ON *.* TO user_caching_sha2;'
482483
else
483-
WITH_PLUGIN=''
484+
WITH_PLUGIN=''
484485
fi
485-
mysql -h127.0.0.1 -uroot -e 'create database test_db DEFAULT CHARACTER SET utf8mb4'
486-
mysql -h127.0.0.1 -uroot -e "create user tester identified ${WITH_PLUGIN} by 'testpass'; grant all on test_db.* to tester;"
487-
mysql -h127.0.0.1 -uroot -e "create user tester@localhost identified ${WITH_PLUGIN} by 'testpass'; grant all on test_db.* to tester@localhost;"
488-
cp ci/db_credentials.json tests/db_credentials.json
489-
486+
mysql -h127.0.0.1 -uroot -e "create database $MYSQL_DATABASE DEFAULT CHARACTER SET utf8mb4"
487+
mysql -h127.0.0.1 -uroot -e "create user $MYSQL_USER identified $WITH_PLUGIN by '${MYSQL_PASSWORD}'; grant all on ${MYSQL_DATABASE}.* to ${MYSQL_USER};"
488+
mysql -h127.0.0.1 -uroot -e "create user ${MYSQL_USER}@localhost identified $WITH_PLUGIN by '${MYSQL_PASSWORD}'; grant all on ${MYSQL_DATABASE}.* to ${MYSQL_USER}@localhost;"
489+
- name: Create db_credentials.json
490+
env:
491+
MYSQL_USER: ${{ secrets.MYSQL_USER }}
492+
MYSQL_PASSWORD: ${{ secrets.MYSQL_PASSWORD }}
493+
MYSQL_DATABASE: ${{ vars.MYSQL_DATABASE }}
494+
MYSQL_HOST: ${{ vars.MYSQL_HOST }}
495+
MYSQL_PORT: ${{ vars.MYSQL_PORT }}
496+
run: |
497+
set -e
498+
jq -n \
499+
--arg mysql_user "$MYSQL_USER" \
500+
--arg mysql_password "$MYSQL_PASSWORD" \
501+
--arg mysql_database "$MYSQL_DATABASE" \
502+
--arg mysql_host "$MYSQL_HOST" \
503+
--arg mysql_port $MYSQL_PORT \
504+
'$ARGS.named' > tests/db_credentials.json
490505
- name: Test with tox
491-
run: tox
492506
env:
493507
LEGACY_DB: ${{ matrix.legacy_db }}
494-
508+
run: tox
495509
- name: Upload coverage to Codecov
496510
uses: codecov/codecov-action@v3
497511
with:
498512
files: ./coverage.xml
499513
env_vars: OS,PYTHON
500514
verbose: true
515+
- name: Cleanup
516+
if: ${{ always() }}
517+
run: |
518+
rm -rf tests/db_credentials.json

‎ci/db_credentials.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)