Skip to content

Commit

Permalink
Change releases to put news in tags
Browse files Browse the repository at this point in the history
Stop using the NEWS file and put release news into the tag description.
Use https://github.com/cockpit-project/action-release/ to publish the
GitHub release.
  • Loading branch information
martinpitt committed Jun 9, 2022
1 parent 4a191d8 commit f7c9d0d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 40 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@ jobs:
run: ./setup.py sdist

- name: Create GitHub release
uses: docker://antonyurchenko/git-release:latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CHANGELOG_FILE: "NEWS"
uses: cockpit-project/action-release@62db9d9850a1adec300500d84035c4f523fd5290
with:
args: dist/python-dbusmock-*.tar.gz
filename: "python-dbusmock-${{ github.ref_name }}.tar.xz"

- name: Create PyPy release
uses: pypa/gh-action-pypi-publish@master
Expand Down
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
OBSOLETE: Release news of newer versions are contained in the git tag descriptions.

## [0.27.5] - 2022-04-05
- bluez and accountsservice templates: Drop default arguments from D-Bus methods (thanks Simon McVittie)

Expand Down
33 changes: 0 additions & 33 deletions do-release

This file was deleted.

5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
#!/usr/bin/python3
'''python-dbusmock - Mock D-Bus objects for testing'''

import subprocess

import setuptools

with open('README.md', encoding="UTF-8") as f:
readme = f.read()

with open('NEWS', 'r', encoding="UTF-8") as f:
version = f.readline().split('[')[1].split(']')[0]
version = subprocess.check_output(['git', 'describe'], universal_newlines=True).strip()

setuptools.setup(
name='python-dbusmock',
Expand Down

0 comments on commit f7c9d0d

Please sign in to comment.