From 54c0ddfd88b1c1cf65a1fc119d06afda778b192b Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Fri, 18 Feb 2022 09:26:20 +0900
Subject: [PATCH] Update workflows

---
 .github/workflows/ci.yml           | 26 ++++++++++++--------------
 .github/workflows/pypi-publish.yml |  9 ++++-----
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 46d4da8f..15bd5e59 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,6 +6,9 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./backend
 
     steps:
     - uses: actions/checkout@v2
@@ -16,29 +19,24 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pipenv
-        pipenv sync --dev
+        pip install poetry
+        poetry install
     - name: Run migrations
       run: |
-        pipenv run wait_for_db
-        pipenv run migrate
-      working-directory: ./backend
+        poetry run task wait_for_db
+        poetry run task migrate
     - name: Lint with flake8
       run: |
-        pipenv run flake8
-      working-directory: ./backend
+        poetry run task flake8
     - name: Lint with isort
       run: |
-        pipenv run isort
-      working-directory: ./backend
+        poetry run task isort
     - name: Black
       run: |
-        pipenv run black
-      working-directory: ./backend
+        poetry run task black
     - name: mypy
       run: |
-        pipenv run mypy
+        poetry run task mypy
     - name: Run tests
       run: |
-        pipenv run test
-      working-directory: ./backend
+        poetry run task test
diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
index 6fe72602..7dbd94c3 100644
--- a/.github/workflows/pypi-publish.yml
+++ b/.github/workflows/pypi-publish.yml
@@ -32,15 +32,14 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pipenv
-        pipenv sync --dev
+        pip install poetry
+        poetry install
     - name: collectstatic
       run: |
-        pipenv run collectstatic
-      working-directory: ./backend
+        poetry run task collectstatic
     - name: Build a binary wheel and a source tarball
       run: |
-        python setup.py sdist
+        poetry build
     - name: Publish a Python distribution to PyPI
       uses: pypa/gh-action-pypi-publish@master
       with: