diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index 27294f9..3e7003b 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -9,6 +9,7 @@ jobs: release: runs-on: ubuntu-latest concurrency: release + environment: release permissions: id-token: write diff --git a/README.md b/README.md index 84ff2f1..b445d05 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Code Style: black](https://img.shields.io/badge/Code%20Style-black-000000.svg)](https://github.com/psf/black) [![codecov](https://codecov.io/gh/sandialabs/reverse_argparse/branch/master/graph/badge.svg?token=FmDStZ6FVR)](https://codecov.io/gh/sandialabs/reverse_argparse) -[![Continuous Integration](https://github.com/sandialabs/reverse_argparse/actions/workflows/ci.yml/badge.svg)](https://github.com/sandialabs/reverse_argparse/actions/workflows/ci.yml) +[![Continuous Integration](https://github.com/sandialabs/reverse_argparse/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/sandialabs/reverse_argparse/actions/workflows/continuous-integration.yml) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE_OF_CONDUCT.md) [![Documentation Status](https://readthedocs.org/projects/reverse-argparse/badge/?version=latest)](https://reverse-argparse.readthedocs.io/en/latest/?badge=latest) [![Linting: Pylint](https://img.shields.io/badge/Linting-Pylint-yellowgreen)](https://github.com/pylint-dev/pylint) diff --git a/release_notes.md b/release_notes.md deleted file mode 100644 index f7b74db..0000000 --- a/release_notes.md +++ /dev/null @@ -1,17 +0,0 @@ - -# v1.0.2 (2023-07-24) - -## Continuous Integration -* ci: Remove `-vv` for `semantic-release` ([`d83ae5d`](https://github.com/sandialabs/reverse_argparse/commit/d83ae5d1063a43de2822ba513b574745eed5a2e9)) - -## Fix -* fix: Release notes template ([`1ac839a`](https://github.com/sandialabs/reverse_argparse/commit/1ac839a5bf1a252830dd9bf9267bd049031b7f9b)) -* fix: Semantic release configuration ([`0325dc0`](https://github.com/sandialabs/reverse_argparse/commit/0325dc0cd5dacee541f495652857fe43c9e1a3fe)) - - * Add `__init__.py` to the files modified. - * Fix the `__version__` in that file. - * Remove trailing space in CHANGELOG template. - * Add build command. - * Make release commit match conventional standard. - * Add release notes template. - * Publish releases to PyPI and GitHub Releases. diff --git a/templates/CHANGELOG.md.j2 b/templates/CHANGELOG.md.j2 index 0896a6a..676f8d5 100644 --- a/templates/CHANGELOG.md.j2 +++ b/templates/CHANGELOG.md.j2 @@ -1,21 +1,7 @@ # CHANGELOG -{% if context.history.unreleased | length > 0 %} -## Unreleased -{% for type_, commits in context.history.unreleased | dictsort %} -### {{ type_ | capitalize if type_ != "ci" else "Continuous Integration" }} -{% for commit in commits -%} -{%- set summary = commit.message.rstrip().splitlines()[0] -%} -{%- set details = commit.message.rstrip().splitlines()[2:] -%} -* {{ summary }} ([`{{ commit.hexsha[:7] }}`]({{ commit.hexsha | commit_hash_url }})) -{% if details %} -{% for line in details %}{% if line.strip() %} {{ line }}{% endif %} -{% endfor %}{% endif %}{% endfor -%} -{% endfor %} -{% endif %} - -{% for version, release in context.history.released.items() -%} +{% for version, release in context.history.released.items() %} ## {{ version.as_tag() }} ({{ release.tagged_date.strftime("%Y-%m-%d") }}) {% for type_, commits in release["elements"] | dictsort %} ### {{ type_ | capitalize if type_ != "ci" else "Continuous Integration" }} diff --git a/templates/release_notes.md.j2 b/templates/release_notes.md.j2 deleted file mode 100644 index 15cf300..0000000 --- a/templates/release_notes.md.j2 +++ /dev/null @@ -1,12 +0,0 @@ -{% set version, release = context.history.released.items() | first %} -# {{ version.as_tag() }} ({{ release.tagged_date.strftime("%Y-%m-%d") }}) -{% for type_, commits in release["elements"] | dictsort %} -## {{ type_ | capitalize if type_ != "ci" else "Continuous Integration" }} -{% for commit in commits -%} -{%- set summary = commit.message.rstrip().splitlines()[0] -%} -{%- set details = commit.message.rstrip().splitlines()[2:] -%} -* {{ summary }} ([`{{ commit.hexsha[:7] }}`]({{ commit.hexsha | commit_hash_url }})) -{% if details %} -{% for line in details %}{% if line.strip() %} {{ line }}{% endif %} -{% endfor %}{% endif %}{% endfor -%} -{% endfor %}