Compare commits

..

No commits in common. "0e35c82dec49f59add67610deba9bf8bcba35351" and "e31a8d094eea9711ed6bd8ff1648abdd6209c494" have entirely different histories.

7 changed files with 56 additions and 103 deletions

View File

@ -40,43 +40,13 @@ jobs:
- name: Run Unit Tests - name: Run Unit Tests
run: python -m unittest -v run: python -m unittest -v
test-action:
name: Test Github Action
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Get Changelog Information
uses: ./
id: yaclog-show
with:
changelog-path: 'tests/Test-Changelog.md'
- name: Copy Body File
run:
cp ${{ steps.yaclog-show.outputs.body-file }} body.md
- name: Fail
if: >
!(
steps.yaclog-show.outputs.name == '0.13.0 "Aquarius"' &&
steps.yaclog-show.outputs.header == '## 0.13.0 "Aquarius" - 1970-04-11 [YANKED]' &&
steps.yaclog-show.outputs.version == '0.13.0' &&
endsWith(steps.yaclog-show.outputs.changelog, 'tests/Test-Changelog.md') &&
hashFiles('body.md') == 'ad49b5c946b7d361db1c3dacc73de4f6222cca6272aab426786de168eede702b'
)
run: |
echo "Action self-test failed!"
echo "${{ toJSON(steps.yaclog-show.outputs) }}"
echo "${{ hashFiles('body.md') }}"
false
build: build:
name: Build Distribution name: Build Distribution
needs: needs: test
- test
- test-action
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
outputs:
body_file: ${{ steps.yaclog-show.outputs.body_file }}
version_name: ${{ steps.yaclog-show.outputs.name }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -85,6 +55,10 @@ jobs:
with: with:
python-version: '3.12' python-version: '3.12'
- name: Get Changelog Information
id: yaclog-show
uses: ./ # self-hosting!
- name: Install pypa/build - name: Install pypa/build
run: python -m pip install build --user run: python -m pip install build --user
@ -127,22 +101,16 @@ jobs:
permissions: permissions:
contents: write contents: write
steps: steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
with: with:
name: python-distribution name: python-distribution
path: dist/ path: dist/
- name: Get Changelog Information
id: yaclog-show
uses: ./ # self-hosting!
- name: Publish to Github - name: Publish to Github
run: > run: >
gh release create ${{ github.ref_name }} gh release create ${{ github.ref_name }}
--notes-file "${{ steps.yaclog-show.outputs.body-file }}" --notes-file "${{ needs.build.outputs.body_file }}"
--title "${{ steps.yaclog-show.outputs.name }}" --title "${{ needs.build.outputs.version_name }}"
dist/* dist/*
env: env:
GH_TOKEN: ${{ github.token }} GH_TOKEN: ${{ github.token }}

View File

@ -2,17 +2,6 @@
All notable changes to this project will be documented in this file All notable changes to this project will be documented in this file
## Version 1.4.3 - 2024-08-28
### Fixed
- Fixed package missing the cli module in some circumstances
### Changed
- Added the `body-file` output to the github action. `body_file` still exists but is aliased to `body-file`
## Version 1.4.2 - 2024-08-27 ## Version 1.4.2 - 2024-08-27
### Fixed ### Fixed

View File

@ -28,12 +28,9 @@ outputs:
version: version:
description: "The current version number. For example, `1.3.0`" description: "The current version number. For example, `1.3.0`"
value: ${{ steps.yaclog-show.outputs.version }} value: ${{ steps.yaclog-show.outputs.version }}
body-file:
description: "Path to a temporary file containing the version body"
value: ${{ steps.yaclog-show.outputs.body-file }}
body_file: body_file:
description: "Alias for body-file" description: "Path to a temporary file containing the version body"
value: ${{ steps.yaclog-show.outputs.body-file }} value: ${{ steps.yaclog-show.outputs.body_file }}
changelog: changelog:
description: "Path to the entire changelog file." description: "Path to the entire changelog file."
value: ${{ steps.yaclog-show.outputs.changelog }} value: ${{ steps.yaclog-show.outputs.changelog }}

View File

@ -34,6 +34,45 @@ Tags are additional metadata added to a version header, denoted by all-caps text
## Example ## Example
```{literalinclude} ../../tests/Test-Changelog.md ```markdown
:language: markdown # Changelog
All notable changes to this project will be documented in this file.
## 0.13.0 "Aquarius" - 1970-04-11 [YANKED]
Yanked due to issues with oxygen tanks, currently investigating
### Added
- Extra propellant in preparation for future versions
### Changed
- Replaced Ken Mattingly
- Stirred oxygen tanks
## 0.12.0 "Intrepid" - 1969-11-14
### Added
- New ALSEP package for surface science
- Color cameras
- Surface rendezvous with Surveyor 3
### Fixed
- 1201/1202 alarm distracting crew during landing
### Known Issues
- Lightning strike during launch: No effect on performance
## 0.11.0 "Eagle" - 1969-07-20
Initial stable release
### Changed
- Fully fueled lander to allow landing on the lunar surface
``` ```

View File

@ -46,7 +46,7 @@ The most recent version name, equivalent to the output of `yaclog show --name`.
The entire header for the most recent version, equivalent to the output of `yaclog show --header`. For example, `Version 1.3.0 - 2024-08-08` The entire header for the most recent version, equivalent to the output of `yaclog show --header`. For example, `Version 1.3.0 - 2024-08-08`
``` ```
```{confval} body-file ```{confval} body_file
The path to a temporary file containing the body of the most recent version. Contents equivalent to `yaclog show --body` The path to a temporary file containing the body of the most recent version. Contents equivalent to `yaclog show --body`
``` ```
@ -82,7 +82,7 @@ jobs:
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
run: | run: |
gh release create {{ '${{ github.ref_name }}' }} \ gh release create {{ '${{ github.ref_name }}' }} \
--notes-file "{{ '${{ steps.yaclog.outputs.body-file }}' }}" \ --notes-file "{{ '${{ steps.yaclog.outputs.body_file }}' }}" \
--title "{{ '${{ steps.yaclog.outputs.name }}' }}" --title "{{ '${{ steps.yaclog.outputs.name }}' }}"
env: env:
GH_TOKEN: {{ '${{ github.token }}' }} GH_TOKEN: {{ '${{ github.token }}' }}

View File

@ -1,40 +0,0 @@
# Changelog
All notable changes to this project will be documented in this file.
## 0.13.0 "Aquarius" - 1970-04-11 [YANKED]
Yanked due to issues with oxygen tanks, currently investigating
### Added
- Extra propellant in preparation for future versions
### Changed
- Replaced Ken Mattingly
- Stirred oxygen tanks
## 0.12.0 "Intrepid" - 1969-11-14
### Added
- New ALSEP package for surface science
- Color cameras
- Surface rendezvous with Surveyor 3
### Fixed
- 1201/1202 alarm distracting crew during landing
### Known Issues
- Lightning strike during launch: No effect on performance
## 0.11.0 "Eagle" - 1969-07-20
Initial stable release
### Changed
- Fully fueled lander to allow landing on the lunar surface

View File

@ -123,7 +123,7 @@ def show(obj: Changelog, all_versions, markdown, mode, version_names, gh_actions
body_fd, body_file = tempfile.mkstemp(text=True) body_fd, body_file = tempfile.mkstemp(text=True)
with os.fdopen(body_fd, 'w') as f: with os.fdopen(body_fd, 'w') as f:
f.write(sep.join([functions['body'](v, kwargs) for v in versions])) f.write(sep.join([functions['body'](v, kwargs) for v in versions]))
click.echo(f'body-file={body_file}') click.echo(f'body_file={body_file}')
click.echo(f'changelog={obj.path}') click.echo(f'changelog={obj.path}')
return return