From 897de7237c660ae06fe6c2ea3fc082f51a20104a Mon Sep 17 00:00:00 2001 From: Julien Fraichot Date: Thu, 7 Mar 2024 14:40:48 +0100 Subject: [PATCH 1/3] Revert "chore(SemanticRelease): run only on merge build" This reverts commit d26ee30d30bff3d960bd65cd3fc3299bd050ea1a. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 28b66365..1006bb38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ after_success: - pip install python-semantic-release==7.34.6 - git config user.name botcerts - git config user.email botcerts@learningmachine.com - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then semantic-release publish; fi' # trigger semantic release only on merge build + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git checkout master; fi' # trigger semantic release only on merge build + - semantic-release publish after_script: - nvm install 16 - sh prepare-vc-compliance-tests-config.sh From c701a12de13c7aaad0124bb80c2b9e4edeb975bc Mon Sep 17 00:00:00 2001 From: Julien Fraichot Date: Thu, 7 Mar 2024 14:41:02 +0100 Subject: [PATCH 2/3] Revert "chore(SemanticRelease): revert to v7 with support for pypi uplaod" This reverts commit 0f2fc9a34513940ed8ed788e4a27a3ed5fb68c37. --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1006bb38..0e8b3421 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,12 @@ python: install: pip install tox-travis script: tox after_success: - - pip install python-semantic-release==7.34.6 + - pip install python-semantic-release - git config user.name botcerts - git config user.email botcerts@learningmachine.com + - git branch - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git checkout master; fi' # trigger semantic release only on merge build - - semantic-release publish + - semantic-release version && semantic-release publish after_script: - nvm install 16 - sh prepare-vc-compliance-tests-config.sh From d02caed7a071e2604cc3ca9c8dae3d6f1ec2340d Mon Sep 17 00:00:00 2001 From: Julien Fraichot Date: Thu, 7 Mar 2024 15:01:59 +0100 Subject: [PATCH 3/3] chore(SemanticRelease): use release_package as build_command, as recommended by the migration doc https://python-semantic-release.readthedocs.io/en/latest/migrating_from_v7.html#repurposing-of-version-and-publish-commands --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 68e26ba8..5bcc8622 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ tag_format = "v{version}" version_variables = [ "cert_issuer/__init__.py:__version__" ] -build_command = "python3 setup.py sdist bdist_wheel" +build_command = "sh release_package.sh" upload_to_pypi = true [tool.semantic_release.branches.main]