From e18ebbbede731e0b8161d1320987d6841e1d7fd6 Mon Sep 17 00:00:00 2001 From: hminaee-tc Date: Wed, 3 Jul 2024 21:39:52 -0300 Subject: [PATCH 1/9] xxx --- .github/workflows/publish-to-pypi.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index bab590d..7ded127 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -22,7 +22,6 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python uses: actions/setup-python@v5.1.0 with: @@ -54,7 +53,7 @@ jobs: run: python -m build - name: Publish package to PyPI - if: ${{ github.event_name == 'pull_request' && github.head_ref == '/refs/heads/main' && github.event.action == 'closed' && github.event.pull_request.merged == true }} + if: ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.head_ref == 'main' }} uses: pypa/gh-action-pypi-publish@release/v1 with: skip-existing: true From 07130fd30cb3188e7abaffe2577d2dd55fc55157 Mon Sep 17 00:00:00 2001 From: hminaee-tc Date: Wed, 3 Jul 2024 21:40:55 -0300 Subject: [PATCH 2/9] xxx --- .github/workflows/publish-to-pypi.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 7ded127..ab39573 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -9,9 +9,11 @@ on: push: branches: - main + - test-1 pull_request: branches: - main + - test-1 jobs: build: From f4850ec4354bb97d9d423b31a10fe361f4d14285 Mon Sep 17 00:00:00 2001 From: hminaee-tc Date: Wed, 3 Jul 2024 21:41:28 -0300 Subject: [PATCH 3/9] xxx --- .github/workflows/publish-to-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index ab39573..673a41f 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -55,7 +55,7 @@ jobs: run: python -m build - name: Publish package to PyPI - if: ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.head_ref == 'main' }} + if: ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.head_ref == 'test-1' }} uses: pypa/gh-action-pypi-publish@release/v1 with: skip-existing: true From ad9ceb9a6e7f74ad6b59beff56e0595c6b09a9b5 Mon Sep 17 00:00:00 2001 From: hminaee-tc Date: Wed, 3 Jul 2024 21:44:17 -0300 Subject: [PATCH 4/9] xxx (#3) * xxx * xxx * xxx --- .github/workflows/publish-to-pypi.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index bab590d..673a41f 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -9,9 +9,11 @@ on: push: branches: - main + - test-1 pull_request: branches: - main + - test-1 jobs: build: @@ -22,7 +24,6 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python uses: actions/setup-python@v5.1.0 with: @@ -54,7 +55,7 @@ jobs: run: python -m build - name: Publish package to PyPI - if: ${{ github.event_name == 'pull_request' && github.head_ref == '/refs/heads/main' && github.event.action == 'closed' && github.event.pull_request.merged == true }} + if: ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.head_ref == 'test-1' }} uses: pypa/gh-action-pypi-publish@release/v1 with: skip-existing: true From 38a9dc978def472eb4f54d4e05426091b5c81e32 Mon Sep 17 00:00:00 2001 From: hminaee-tc Date: Wed, 3 Jul 2024 21:48:38 -0300 Subject: [PATCH 5/9] xxx --- .github/workflows/publish-to-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 673a41f..869c955 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -55,7 +55,7 @@ jobs: run: python -m build - name: Publish package to PyPI - if: ${{ github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.head_ref == 'test-1' }} + if: ${{ github.ref == 'refs/heads/test-1' && github.event_name == 'push' }} uses: pypa/gh-action-pypi-publish@release/v1 with: skip-existing: true From 3d3cdbde6374981cf083f1ade1cb3047054c88a5 Mon Sep 17 00:00:00 2001 From: hminaee-tc Date: Thu, 4 Jul 2024 11:27:14 -0300 Subject: [PATCH 6/9] fix/gitflow update the logic --- .github/workflows/publish-to-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 869c955..a67ccad 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -55,7 +55,7 @@ jobs: run: python -m build - name: Publish package to PyPI - if: ${{ github.ref == 'refs/heads/test-1' && github.event_name == 'push' }} + if: ${{ github.ref == 'refs/heads/fix/gitflow' && github.event_name == 'push' }} uses: pypa/gh-action-pypi-publish@release/v1 with: skip-existing: true From 2a7e47f3d09e889c7576ba95a957654fd5f097b3 Mon Sep 17 00:00:00 2001 From: hminaee-tc Date: Thu, 4 Jul 2024 11:29:47 -0300 Subject: [PATCH 7/9] fix/gitflow update the logic --- .github/workflows/publish-to-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index a67ccad..b4cbe35 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -55,7 +55,7 @@ jobs: run: python -m build - name: Publish package to PyPI - if: ${{ github.ref == 'refs/heads/fix/gitflow' && github.event_name == 'push' }} + if: ${{ github.ref == 'refs/heads/test-2' && github.event_name == 'push' }} uses: pypa/gh-action-pypi-publish@release/v1 with: skip-existing: true From f5f48e55442ca28bc0999595ba214135782a54e4 Mon Sep 17 00:00:00 2001 From: hminaee-tc Date: Thu, 4 Jul 2024 14:43:31 -0300 Subject: [PATCH 8/9] fix/gitflow update the logic for flow --- .github/workflows/publish-to-pypi.yml | 4 +--- pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index b4cbe35..fd1d197 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -9,11 +9,9 @@ on: push: branches: - main - - test-1 pull_request: branches: - main - - test-1 jobs: build: @@ -55,7 +53,7 @@ jobs: run: python -m build - name: Publish package to PyPI - if: ${{ github.ref == 'refs/heads/test-2' && github.event_name == 'push' }} + if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }} uses: pypa/gh-action-pypi-publish@release/v1 with: skip-existing: true diff --git a/pyproject.toml b/pyproject.toml index 37da49f..d324097 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,8 +7,8 @@ packages = { find = { where = ["."] } } [project] name = "opencepk-lib-python-common" -version = "1.0.0" -description = "Python package and pre-commit-hook for finding and replacing string(s) in file(s)." +version = "2.0.0" +description = "Common Python opencepk packages." readme = "README.md" license = { text = "GPLv3" } authors = [{name = "OpenCEPK Open Cloud Engineering Platform Kit", email = "opencepk@gmail.com"}] From c9c8639810788514e2afcdd18aec963acf05f36d Mon Sep 17 00:00:00 2001 From: hminaee-tc Date: Thu, 4 Jul 2024 15:14:08 -0300 Subject: [PATCH 9/9] fix/gitflow update the logic for flow --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d324097..7be35ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ packages = { find = { where = ["."] } } [project] name = "opencepk-lib-python-common" -version = "2.0.0" +version = "1.1.0" description = "Common Python opencepk packages." readme = "README.md" license = { text = "GPLv3" }