Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated workflows #4

Merged
merged 2 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/shry-deploy-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches: [ "main" ]

jobs:
deploy-pypi:
deploy-test-pypi:
if: github.repository == 'shry-project/SHRY'

runs-on: ubuntu-latest
Expand All @@ -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__
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shry-pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: SHRY pytest

on:
push:
branches: [ "master", "devel" ]
branches: [ "main", "devel" ]
pull_request:
branches: [ "main", "devel" ]

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -174,7 +174,7 @@ Add and push with the new tag
git tag <next-version> # 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).