From 0a2be7a5ab1c2393504a199a5c99598e1e062872 Mon Sep 17 00:00:00 2001 From: "kosuke.nakano" Date: Wed, 27 Dec 2023 09:59:07 +0900 Subject: [PATCH 1/2] updated workflows --- .github/workflows/shry-deploy-test.yml | 4 ++-- .github/workflows/shry-pytest.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/shry-deploy-test.yml b/.github/workflows/shry-deploy-test.yml index c4e5158..726c158 100644 --- a/.github/workflows/shry-deploy-test.yml +++ b/.github/workflows/shry-deploy-test.yml @@ -4,7 +4,7 @@ on: branches: [ "main" ] jobs: - deploy-pypi: + deploy-test-pypi: if: github.repository == 'shry-project/SHRY' runs-on: ubuntu-latest @@ -30,7 +30,7 @@ jobs: python setup.py sdist bdist_wheel - name: Publish distribution to Test PyPI - #if: startsWith(github.ref, 'refs/tags/v') + if: startsWith(github.ref, 'refs/tags/v') uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ diff --git a/.github/workflows/shry-pytest.yml b/.github/workflows/shry-pytest.yml index 4ed9d16..7333450 100644 --- a/.github/workflows/shry-pytest.yml +++ b/.github/workflows/shry-pytest.yml @@ -5,7 +5,7 @@ name: SHRY pytest on: push: - branches: [ "master", "devel" ] + branches: [ "main", "devel" ] pull_request: branches: [ "main", "devel" ] From 11096da8cbd5a2268c373ffa3061791baf7655fd Mon Sep 17 00:00:00 2001 From: "kosuke.nakano" Date: Wed, 27 Dec 2023 10:00:27 +0900 Subject: [PATCH 2/2] updated README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 8733027..57415ec 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ README |license| |DL| |release| |PYPI_version| |Python_version| |workflows| |fork| |stars| -.. |logo| image:: https://github.com/shry-project/SHRY/blob/master/logo/logo.jpg?raw=true +.. |logo| image:: https://github.com/shry-project/SHRY/blob/main/logo/logo.jpg?raw=true .. |license| image:: https://img.shields.io/github/license/shry-project/SHRY .. |release| image:: https://img.shields.io/github/release/shry-project/SHRY/all.svg .. |DL| image:: https://img.shields.io/pypi/dm/SHRY @@ -174,7 +174,7 @@ Add and push with the new tag git tag # e.g., git tag v1.1.4 # Do not forget "v" before the version number! git push origin devel --tags # or to the new branch # Do not push to the mater branch!! -Make a pull request for merging the devel branch to the master branch by hand. The implemented GitHub Action checks if the automatic deploy works using test-pyPI. +Make a pull request for merging the devel branch to the main branch by hand. The implemented GitHub Action checks if the automatic deploy works using test-pyPI. Finally, do a new release with a release note on GitHub. The new release triggers an implemented GitHub Action that automatically uploads the package to PyPI (if the commit is tagged correctly, e.g., v1.1.0 or v1.1.0-alpha).