Skip to content

Commit

Permalink
fix: Test another double release
Browse files Browse the repository at this point in the history
- this comment should be reflected in both changelogs
  • Loading branch information
marc-at-brightnight committed Jan 7, 2025
1 parent 1b35492 commit dd500a8
Show file tree
Hide file tree
Showing 15 changed files with 14 additions and 48 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/cicd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
45 changes: 4 additions & 41 deletions documentation/docs/srvc1/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,6 @@ Published by codejedi365.

<!-- version list -->

## 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
Expand All @@ -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

Expand All @@ -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

Expand All @@ -77,4 +40,4 @@ Published by codejedi365.

## v1.0.0 (2025-01-05)

- Initial Release
- Initial Release
4 changes: 2 additions & 2 deletions documentation/templates/.release_notes.md.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions poweralpha/services/srvc1/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__version__ = "1.2.0"
2 changes: 1 addition & 1 deletion poweralpha/services/srvc1/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "srvc1"
version = "1.0.0"
version = "1.2.0"

[project.scripts]
srvc1 = "__main__:main"
Expand Down
4 changes: 2 additions & 2 deletions semantic-release.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
srvc1: false
srvc2: false
srvc1: true
srvc2: true

0 comments on commit dd500a8

Please sign in to comment.