From 4be12908ae546700b4623c528d7ac03a6410fd28 Mon Sep 17 00:00:00 2001 From: Jiyeong Seok Date: Mon, 21 Nov 2022 17:42:24 +0900 Subject: [PATCH 1/2] Fix the ubuntu version for PR environment Signed-off-by: Jiyeong Seok --- .github/workflows/publish-release.yml | 29 +++++++++++++++++++++++---- .github/workflows/pull-request.yml | 2 +- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 79f0324..17c23b7 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -8,7 +8,26 @@ on: types: [published] jobs: + build_ubuntu: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.8] + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install tox + - name: Run Tox + run: | + tox -e release update-changelog: + needs: build_ubuntu runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -50,7 +69,7 @@ jobs: branch: main deploy: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 needs: update-changelog steps: - uses: actions/checkout@v2 @@ -63,11 +82,13 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install setuptools wheel twine + pip install -r requirements.txt + pip freeze > requirements.txt + python -m pip install --upgrade build twine - name: Build and publish env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - python setup.py sdist bdist_wheel - twine upload dist/* + python -m build + python -m twine upload dist/* diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 6c4a78a..37da3f3 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6] + python-version: [3.8] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} From 50124c52ce5a388bf53cb1e34379016f0242eb6d Mon Sep 17 00:00:00 2001 From: Jiyeong Seok <50347670+dd-jy@users.noreply.github.com> Date: Tue, 22 Nov 2022 18:09:12 +0900 Subject: [PATCH 2/2] Update publish-release.yml --- .github/workflows/publish-release.yml | 29 ++++----------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 17c23b7..79f0324 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -8,26 +8,7 @@ on: types: [published] jobs: - build_ubuntu: - runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.8] - steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install tox - - name: Run Tox - run: | - tox -e release update-changelog: - needs: build_ubuntu runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -69,7 +50,7 @@ jobs: branch: main deploy: - runs-on: ubuntu-20.04 + runs-on: ubuntu-18.04 needs: update-changelog steps: - uses: actions/checkout@v2 @@ -82,13 +63,11 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements.txt - pip freeze > requirements.txt - python -m pip install --upgrade build twine + pip install setuptools wheel twine - name: Build and publish env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - python -m build - python -m twine upload dist/* + python setup.py sdist bdist_wheel + twine upload dist/*