From 7b4b7ac74999edf30c4d97bcba5f3a91b49e1672 Mon Sep 17 00:00:00 2001 From: long2ice Date: Tue, 2 Jun 2020 18:58:59 +0800 Subject: [PATCH] update github actions --- .github/workflows/pypi.yml | 14 ++++---------- .github/workflows/test.yml | 10 +++------- Makefile | 4 ++-- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 5dde7af..ae118ef 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -6,19 +6,13 @@ on: jobs: publish: runs-on: ubuntu-latest + env: + POETRY_VIRTUALENVS_CREATE: false steps: - uses: actions/checkout@v2 - name: Install poetry - uses: abatilo/actions-poetry@v1.5.0 - env: - POETRY_VIRTUALENVS_CREATE: false - with: - python_version: 3.8.0 - poetry_version: 1.0.5 - args: install - - name: Build dists - run: | - make build + run: curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python3 - name: Pypi Publish run: | + make build make publish \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a6204c3..edf98fc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,6 +3,8 @@ on: [push, pull_request] jobs: testall: runs-on: ubuntu-latest + env: + POETRY_VIRTUALENVS_CREATE: false services: postgres: image: postgres:latest @@ -17,13 +19,7 @@ jobs: run: sudo systemctl start mysql.service - uses: actions/checkout@v2 - name: Install poetry - uses: abatilo/actions-poetry@v1.5.0 - env: - POETRY_VIRTUALENVS_CREATE: false - with: - python_version: 3.8.0 - poetry_version: 1.0.5 - args: install + run: curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python3 - name: CI env: MYSQL_PASS: root diff --git a/Makefile b/Makefile index 2557482..f268f57 100644 --- a/Makefile +++ b/Makefile @@ -52,10 +52,10 @@ test_postgres: testall: deps test_sqlite test_postgres test_mysql -build: +build: deps @poetry build -publish: +publish: deps @poetry publish ci: