diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index b4eacde..881e478 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -41,10 +41,11 @@ jobs: - name: Reset srvc1 release check if: steps.release-check.outputs.srvc1 == 'true' run: | + rm -rf documentation/templates/documentation yq e -i '.srvc1 = false' semantic-release.yaml # set the "srvc1" entry to false git add . mkdir -p documentation/templates/documentation/docs/srvc1 - rsync -a documentation/templates/.base-changelog-template/ documentation/templates/documentation/docs/srvc1/ + rsync -a documentation/templates/.base_changelog_template/ documentation/templates/documentation/docs/srvc1/ - name: Create srvc1 release if: steps.release-check.outputs.srvc1 == 'true' uses: python-semantic-release/python-semantic-release@v9.15.2 @@ -61,10 +62,11 @@ jobs: run: | git pull git reset --hard HEAD + rm -rf documentation/templates/documentation yq e -i '.srvc2 = false' semantic-release.yaml # set the "srvc2" entry to false git add . mkdir -p documentation/templates/documentation/docs/srvc2 - rsync -a documentation/templates/.base-changelog-template/ documentation/templates/documentation/docs/srvc2/ + rsync -a documentation/templates/.base_changelog_template/ documentation/templates/documentation/docs/srvc2/ - name: Create srvc2 github release if: steps.release-check.outputs.srvc2 == 'true' uses: python-semantic-release/python-semantic-release@v9.15.2 diff --git a/documentation/docs/srvc1/changelog.md b/documentation/docs/srvc1/changelog.md index 373efd1..add475d 100644 --- a/documentation/docs/srvc1/changelog.md +++ b/documentation/docs/srvc1/changelog.md @@ -4,43 +4,6 @@ Published by codejedi365. -## v1.6.0 (2025-01-07) - -### Features - -- Test double release ([`79aab0a`](https://github.com/marc-at-brightnight/psr-monorepo-poweralpha/commit/79aab0ac422828e38ee8ebc0b112a40d1a2a755f)) - - This is double release - - -## v1.5.0 (2025-01-07) - -### Features - -- Another test, with double bullet and jira ticket number ([`67b611c`](https://github.com/marc-at-brightnight/psr-monorepo-poweralpha/commit/67b611cc81a970d68ddd568c8aab4d9912a181d6)) - - test bullet - - -## v1.4.0 (2025-01-07) - -### Features - -- Another feature, single new line this time ([`76e7bf7`](https://github.com/marc-at-brightnight/psr-monorepo-poweralpha/commit/76e7bf796d81a0016cef0e3a6e4c314193dae162)) - -- Let's try one more time, with double new line ([`540de78`](https://github.com/marc-at-brightnight/psr-monorepo-poweralpha/commit/540de78211c65f6b8de5f51afbba727f50028972)) - - test bullet - - -## v1.3.0 (2025-01-06) - -### Features - -- Let's give it one more try ([`e253a8c`](https://github.com/marc-at-brightnight/psr-monorepo-poweralpha/commit/e253a8c6c826555ec9d2213590dccfe94fe049f5)) - - -## v1.0.0 (2025-01-06) - -- Initial Release - ## v1.2.0 (2025-01-06) ### Chores @@ -49,7 +12,7 @@ Published by codejedi365. ### Documentation -- **srvc2-changelog**: Add custom header to changelog ([`0db541d`](https://github.com/codejedi365/psr-monorepo-poweralpha/commit/0db541df59f18f0c14f55562a83e4af9be5e40c9)) +- **srvc1-changelog**: Add custom header to changelog ([`f194cb3`](https://github.com/codejedi365/psr-monorepo-poweralpha/commit/f194cb335b2bf8c1b8391b9f379735e422e4ea34)) ### Features @@ -62,11 +25,11 @@ Published by codejedi365. ### Chores -- **srvc2-scripts**: Add release automation script ([`6359724`](https://github.com/codejedi365/psr-monorepo-poweralpha/commit/635972414dc98ace403bf39a279bd629a3518726)) +- **srvc1-scripts**: Add release automation script ([`db7138b`](https://github.com/codejedi365/psr-monorepo-poweralpha/commit/db7138b3be7704620ca1ecdd6fa9eb14edd3f5c0)) ### Documentation -- **srvc2-readme**: Update readme for service 2 ([`c88a57c`](https://github.com/codejedi365/psr-monorepo-poweralpha/commit/c88a57c1593725080a9dd05dfd68096cd0d49777)) +- **srvc1-readme**: Update readme for service 1 ([`8e288f6`](https://github.com/codejedi365/psr-monorepo-poweralpha/commit/8e288f65a9e5ce77cdda6506176263aa0cba4966)) ### Features @@ -77,4 +40,4 @@ Published by codejedi365. ## v1.0.0 (2025-01-05) -- Initial Release +- Initial Release \ No newline at end of file diff --git a/documentation/templates/.base-changelog-template/.components/changelog_header.md.j2 b/documentation/templates/.base_changelog_template/.components/changelog_header.md.j2 similarity index 100% rename from documentation/templates/.base-changelog-template/.components/changelog_header.md.j2 rename to documentation/templates/.base_changelog_template/.components/changelog_header.md.j2 diff --git a/documentation/templates/.base-changelog-template/.components/changelog_init.md.j2 b/documentation/templates/.base_changelog_template/.components/changelog_init.md.j2 similarity index 100% rename from documentation/templates/.base-changelog-template/.components/changelog_init.md.j2 rename to documentation/templates/.base_changelog_template/.components/changelog_init.md.j2 diff --git a/documentation/templates/.base-changelog-template/.components/changelog_update.md.j2 b/documentation/templates/.base_changelog_template/.components/changelog_update.md.j2 similarity index 100% rename from documentation/templates/.base-changelog-template/.components/changelog_update.md.j2 rename to documentation/templates/.base_changelog_template/.components/changelog_update.md.j2 diff --git a/documentation/templates/.base-changelog-template/.components/changes.md.j2 b/documentation/templates/.base_changelog_template/.components/changes.md.j2 similarity index 100% rename from documentation/templates/.base-changelog-template/.components/changes.md.j2 rename to documentation/templates/.base_changelog_template/.components/changes.md.j2 diff --git a/documentation/templates/.base-changelog-template/.components/first_release.md.j2 b/documentation/templates/.base_changelog_template/.components/first_release.md.j2 similarity index 100% rename from documentation/templates/.base-changelog-template/.components/first_release.md.j2 rename to documentation/templates/.base_changelog_template/.components/first_release.md.j2 diff --git a/documentation/templates/.base-changelog-template/.components/macros.md.j2 b/documentation/templates/.base_changelog_template/.components/macros.md.j2 similarity index 100% rename from documentation/templates/.base-changelog-template/.components/macros.md.j2 rename to documentation/templates/.base_changelog_template/.components/macros.md.j2 diff --git a/documentation/templates/.base-changelog-template/.components/unreleased_changes.md.j2 b/documentation/templates/.base_changelog_template/.components/unreleased_changes.md.j2 similarity index 100% rename from documentation/templates/.base-changelog-template/.components/unreleased_changes.md.j2 rename to documentation/templates/.base_changelog_template/.components/unreleased_changes.md.j2 diff --git a/documentation/templates/.base-changelog-template/.components/versioned_changes.md.j2 b/documentation/templates/.base_changelog_template/.components/versioned_changes.md.j2 similarity index 100% rename from documentation/templates/.base-changelog-template/.components/versioned_changes.md.j2 rename to documentation/templates/.base_changelog_template/.components/versioned_changes.md.j2 diff --git a/documentation/templates/.base-changelog-template/changelog.md.j2 b/documentation/templates/.base_changelog_template/changelog.md.j2 similarity index 100% rename from documentation/templates/.base-changelog-template/changelog.md.j2 rename to documentation/templates/.base_changelog_template/changelog.md.j2 diff --git a/documentation/templates/.release_notes.md.j2 b/documentation/templates/.release_notes.md.j2 index e8e12e2..aa4e10c 100644 --- a/documentation/templates/.release_notes.md.j2 +++ b/documentation/templates/.release_notes.md.j2 @@ -40,10 +40,10 @@ %}{# #}{% if releases | length == 1 and mask_initial_release %}{# # On a first release, generate our special message -#}{% include ".base-changelog-template/.components/first_release.md.j2" +#}{% include ".base_changelog_template/.components/first_release.md.j2" %}{% else %}{# # Not the first release so generate notes normally -#}{% include ".base-changelog-template/.components/versioned_changes.md.j2" +#}{% include ".base_changelog_template/.components/versioned_changes.md.j2" -%}{# #}{% if detailed_changes_link is defined %}{{ "\n" diff --git a/poweralpha/services/srvc1/__init__.py b/poweralpha/services/srvc1/__init__.py index e69de29..c68196d 100644 --- a/poweralpha/services/srvc1/__init__.py +++ b/poweralpha/services/srvc1/__init__.py @@ -0,0 +1 @@ +__version__ = "1.2.0" diff --git a/poweralpha/services/srvc1/pyproject.toml b/poweralpha/services/srvc1/pyproject.toml index 068bd61..821077b 100644 --- a/poweralpha/services/srvc1/pyproject.toml +++ b/poweralpha/services/srvc1/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "srvc1" -version = "1.0.0" +version = "1.2.0" [project.scripts] srvc1 = "__main__:main" diff --git a/semantic-release.yaml b/semantic-release.yaml index bd6dbe8..1048d17 100644 --- a/semantic-release.yaml +++ b/semantic-release.yaml @@ -1,2 +1,2 @@ -srvc1: false -srvc2: false +srvc1: true +srvc2: true