Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Package: fix release workflow, exclude plugin tests, include all files from MANIFEST.in #5536

Merged
merged 2 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions .github/workflows/make_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ on:
env:
PYTHON_VERSION: 3.8
NEW_VERSION: ${{ inputs.version }}
NEW_TAG: v${{ inputs.version }}

jobs:
increment-version:
name: Bump project version and commit it
name: Bump version, commit and create tag
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -28,13 +29,14 @@ jobs:
run: poetry install --only=release

- name: Bump project version
id: script
run: poe bump "${{ env.NEW_VERSION }}"

- uses: EndBug/add-and-commit@v9
name: Commit the changes
id: commit_and_tag
name: Commit the changes and create tag
with:
message: "Increment version to ${{ env.NEW_VERSION }}"
tag: "${{ env.NEW_TAG }} --force"

build:
name: Get changelog and build the distribution package
Expand All @@ -45,7 +47,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: master
ref: ${{ env.NEW_TAG }}

- name: Install Python tools
uses: BrandonLWhite/[email protected]
Expand Down Expand Up @@ -103,17 +105,6 @@ jobs:
env:
CHANGELOG: ${{ needs.build.outputs.changelog }}
steps:
- uses: actions/checkout@v4
with:
ref: master

- name: Tag the commit
id: tag_version
uses: mathieudutour/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
custom_tag: ${{ env.NEW_VERSION }}

- name: Download all the dists
uses: actions/download-artifact@v4
with:
Expand All @@ -123,8 +114,6 @@ jobs:
- name: Create a GitHub release
id: make_release
uses: ncipollo/release-action@v1
env:
NEW_TAG: ${{ steps.tag_version.outputs.new_tag }}
with:
tag: ${{ env.NEW_TAG }}
name: Release ${{ env.NEW_TAG }}
Expand All @@ -136,4 +125,4 @@ jobs:
with:
access-token: ${{ secrets.MASTODON_ACCESS_TOKEN }}
url: ${{ secrets.MASTODON_URL }}
message: "Version ${{ steps.tag_version.outputs.new_tag }} of beets has been released! Check out all of the new changes at ${{ steps.create_release.outputs.html_url }}"
message: "Version ${{ env.NEW_TAG }} of beets has been released! Check out all of the new changes at ${{ steps.make_release.outputs.html_url }}"
36 changes: 0 additions & 36 deletions MANIFEST.in

This file was deleted.

11 changes: 11 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,25 @@ Unreleased
----------

New features:

Bug fixes:

* :doc:`plugins/lyrics`: LRCLib will fallback to plain lyrics if synced lyrics
are not found and `synced` flag is set to `yes`.
* Synchronise files included in the source distribution with what we used to
have before the introduction of Poetry.
:bug:`5531`
:bug:`5526`

For packagers:

Other changes:

* Release workflow: fix the issue where the new release tag is created for the
wrong (outdated) commit. Now the tag is created in the same workflow step
right after committing the version update.
:bug:`5539`

2.2.0 (December 02, 2024)
-------------------------

Expand Down
9 changes: 8 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,14 @@ packages = [
{ include = "beets" },
{ include = "beetsplug" },
]
include = ["test", "man/**/*"] # extra files to include in the sdist
include = [ # extra files to include in the sdist
"docs",
"extra",
"man/**/*",
"test/*.py",
"test/rsrc/**/*",
]
exclude = ["docs/_build", "docs/modd.conf", "docs/**/*.css"]

[tool.poetry.urls]
Changelog = "https://github.com/beetbox/beets/blob/master/docs/changelog.rst"
Expand Down
Loading