Compare commits
1 Commits
v0.0
...
v0.0.1-dev
| Author | SHA1 | Date | |
|---|---|---|---|
| c33b8aae0c |
@@ -1 +1 @@
|
||||
version_descriptor: pyproject.toml
|
||||
version_descriptor: setup.py
|
||||
|
||||
@@ -135,7 +135,7 @@ jobs:
|
||||
- uses: ./add-artefact
|
||||
with:
|
||||
type: wheel
|
||||
filename: "test-assets/wheels/*.whl"
|
||||
pattern: "test-assets/wheels/*.whl"
|
||||
|
||||
- uses: ./add-artefact
|
||||
with:
|
||||
|
||||
@@ -18,7 +18,7 @@ inputs:
|
||||
|
||||
filename:
|
||||
required: false
|
||||
description: "required for tarball, sdist, wheel"
|
||||
description: "required for tarball, sdist"
|
||||
default: ""
|
||||
|
||||
package_name:
|
||||
@@ -26,6 +26,11 @@ inputs:
|
||||
description: "required for tarball"
|
||||
default: ""
|
||||
|
||||
pattern:
|
||||
required: false
|
||||
description: "required for wheel"
|
||||
default: ""
|
||||
|
||||
directory:
|
||||
required: false
|
||||
description: "required for npm"
|
||||
@@ -49,6 +54,7 @@ runs:
|
||||
--artefact-name "${{ inputs.name }}" \
|
||||
--artefact-filename "${{ inputs.filename }}" \
|
||||
--artefact-package-name "${{ inputs.package_name }}" \
|
||||
--artefact-pattern "${{ inputs.pattern }}" \
|
||||
--artefact-directory "${{ inputs.directory }}" \
|
||||
--version-descriptor "${{ inputs.version_descriptor }}" \
|
||||
--write-env-vars-to-filename "$GITHUB_ENV"
|
||||
|
||||
@@ -41,7 +41,7 @@ inputs:
|
||||
|
||||
artefact_filename:
|
||||
required: false
|
||||
description: "required for tarball, sdist, wheel"
|
||||
description: "required for tarball, sdist"
|
||||
default: ""
|
||||
|
||||
artefact_package_name:
|
||||
@@ -49,6 +49,11 @@ inputs:
|
||||
description: "required for tarball"
|
||||
default: ""
|
||||
|
||||
artefact_pattern:
|
||||
required: false
|
||||
description: "required for wheel"
|
||||
default: ""
|
||||
|
||||
artefact_directory:
|
||||
required: false
|
||||
description: "required for npm"
|
||||
@@ -124,6 +129,7 @@ runs:
|
||||
--artefact-name "${{ inputs.artefact_name }}" \
|
||||
--artefact-filename "${{ inputs.artefact_filename }}" \
|
||||
--artefact-package-name "${{ inputs.artefact_package_name }}" \
|
||||
--artefact-pattern "${{ inputs.artefact_pattern }}" \
|
||||
--artefact-directory "${{ inputs.artefact_directory }}" \
|
||||
--version-descriptor "${{ inputs.artefact_version_descriptor }}"
|
||||
fi
|
||||
|
||||
@@ -4,23 +4,6 @@ description: "dump current project description"
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: declare project if neccessary
|
||||
run: |
|
||||
if [[ ! -z "${RELEASE_PROJECT_CURRENT_VERSION}" ]]; then
|
||||
echo "already set up."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
nix run ${{ github.action_path }} -- \
|
||||
declare \
|
||||
--release-yaml-filename ".gitea/release.yaml" \
|
||||
--gitea-instance "https://gitea.puzzleyou.net" \
|
||||
--release-repository-name "${{ github.repository }}" \
|
||||
--release-ref-name "${{ github.ref_name }}" \
|
||||
--release-run-number "${{ github.run_number }}" \
|
||||
--release-commit-sha "${{ github.sha }}" \
|
||||
--write-env-vars-to-filename "$GITHUB_ENV"
|
||||
|
||||
- name: dump project description
|
||||
run: |
|
||||
nix run ${{ github.action_path }} -- \
|
||||
|
||||
23
flake.lock
generated
23
flake.lock
generated
@@ -34,31 +34,10 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pyproject-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764134915,
|
||||
"narHash": "sha256-xaKvtPx6YAnA3HQVp5LwyYG1MaN4LLehpQI8xEdBvBY=",
|
||||
"owner": "pyproject-nix",
|
||||
"repo": "pyproject.nix",
|
||||
"rev": "2c8df1383b32e5443c921f61224b198a2282a657",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "pyproject-nix",
|
||||
"repo": "pyproject.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"pyproject-nix": "pyproject-nix"
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
||||
49
flake.nix
49
flake.nix
@@ -4,41 +4,52 @@
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
|
||||
pyproject-nix = {
|
||||
url = "github:pyproject-nix/pyproject.nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, flake-utils, pyproject-nix }:
|
||||
outputs = { self, nixpkgs, flake-utils, ... }:
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
|
||||
pythonProject = pyproject-nix.lib.project.loadPyproject {
|
||||
projectRoot = ./.;
|
||||
};
|
||||
python = pkgs.python313.withPackages (ps: with ps; [
|
||||
isort
|
||||
flake8
|
||||
semver
|
||||
toml
|
||||
requests
|
||||
pyyaml
|
||||
packaging
|
||||
]);
|
||||
|
||||
pythonInterpreter = pkgs.python313;
|
||||
pythonPackage = pkgs.python3Packages.buildPythonPackage {
|
||||
name = "release-action";
|
||||
src = ./.;
|
||||
};
|
||||
in
|
||||
{
|
||||
devShells.default = pkgs.mkShell {
|
||||
buildInputs = [
|
||||
pkgs.envsubst
|
||||
pkgs.just
|
||||
pkgs.gitea-actions-runner
|
||||
(pythonInterpreter.withPackages
|
||||
(pythonProject.renderers.withPackages {
|
||||
python = pythonInterpreter;
|
||||
extraPackages = ps: with ps; [ flake8 isort ];
|
||||
}))
|
||||
python
|
||||
];
|
||||
};
|
||||
|
||||
packages.default = pythonInterpreter.pkgs.buildPythonPackage (
|
||||
pythonProject.renderers.buildPythonPackage {
|
||||
python = pythonInterpreter;
|
||||
});
|
||||
packages.default = pkgs.writers.writePython3Bin
|
||||
"release-action"
|
||||
{
|
||||
libraries = with pkgs.python3Packages; [
|
||||
semver # TODO move to setup.py?
|
||||
toml
|
||||
requests
|
||||
pythonPackage
|
||||
pyyaml
|
||||
packaging
|
||||
];
|
||||
}
|
||||
(builtins.readFile ./src/main.py)
|
||||
;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
[project]
|
||||
name = "gitea-release-action"
|
||||
version = "0.0.1"
|
||||
description = "reusable action for release workflows"
|
||||
authors = [ ]
|
||||
requires-python = ">=3.13"
|
||||
dependencies = [
|
||||
"semver",
|
||||
"toml",
|
||||
"requests",
|
||||
"pyyaml",
|
||||
"packaging"
|
||||
]
|
||||
|
||||
[project.scripts]
|
||||
gitea-release-action = "main:main_cli"
|
||||
6
setup.py
Normal file
6
setup.py
Normal file
@@ -0,0 +1,6 @@
|
||||
from setuptools import setup
|
||||
|
||||
setup(
|
||||
name='release-action',
|
||||
version='0.0.1',
|
||||
)
|
||||
11
src/main.py
11
src/main.py
@@ -82,7 +82,7 @@ def dump_project_description(project_description: ProjectDescription):
|
||||
print(' release version name: %s' % release_info.version_str)
|
||||
|
||||
elif isinstance(generated, Wheel):
|
||||
print(' - wheel: %s' % generated.filename)
|
||||
print(' - wheel: %s' % generated.pattern)
|
||||
print(' repository: %s' % generated.repository)
|
||||
print(' release version name: %s' % release_info.version_str)
|
||||
|
||||
@@ -152,6 +152,7 @@ def make_artefact(type: str,
|
||||
name: str,
|
||||
filename: str,
|
||||
package_name: str,
|
||||
pattern: str,
|
||||
directory: str,
|
||||
version_descriptor) -> ArtefactDescription:
|
||||
|
||||
@@ -171,8 +172,8 @@ def make_artefact(type: str,
|
||||
**maybe_repository)
|
||||
|
||||
elif type == 'wheel':
|
||||
assert filename is not None
|
||||
generated = Wheel(filename=filename, **maybe_repository)
|
||||
assert pattern is not None
|
||||
generated = Wheel(pattern=pattern, **maybe_repository)
|
||||
|
||||
elif type == 'sdist':
|
||||
assert filename is not None
|
||||
@@ -247,7 +248,7 @@ def sync_versions(project_description: ProjectDescription):
|
||||
sync(artefact.version_descriptor)
|
||||
|
||||
|
||||
def main_cli():
|
||||
if __name__ == '__main__':
|
||||
parser = ArgumentParser()
|
||||
parser.add_argument('action', choices=[
|
||||
'declare',
|
||||
@@ -296,6 +297,7 @@ def main_cli():
|
||||
parser.add_argument('--artefact-name', type=nullable_string)
|
||||
parser.add_argument('--artefact-package-name', type=nullable_string)
|
||||
parser.add_argument('--artefact-filename', type=nullable_string)
|
||||
parser.add_argument('--artefact-pattern', type=nullable_string)
|
||||
parser.add_argument('--artefact-directory', type=nullable_string)
|
||||
|
||||
parser.add_argument('--deployment-type',
|
||||
@@ -357,6 +359,7 @@ def main_cli():
|
||||
args.artefact_name,
|
||||
args.artefact_filename,
|
||||
args.artefact_package_name,
|
||||
args.artefact_pattern,
|
||||
args.artefact_directory,
|
||||
args.version_descriptor)
|
||||
|
||||
|
||||
@@ -97,14 +97,14 @@ class Tarball:
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class WheelReleaseInfo:
|
||||
filename: str
|
||||
pattern: str
|
||||
repository: str
|
||||
version_str: str
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class Wheel:
|
||||
filename: str
|
||||
pattern: str
|
||||
repository: str = DEFAULT_PYPI_REPOSITORY_NAME
|
||||
|
||||
def make_environment_variables(self, context, version):
|
||||
@@ -112,7 +112,7 @@ class Wheel:
|
||||
|
||||
def make_release_info(self, context: ReleaseContext, version: Version):
|
||||
return WheelReleaseInfo(
|
||||
filename=self.filename,
|
||||
pattern=self.pattern,
|
||||
repository=self.repository,
|
||||
version_str=python_version_str(version))
|
||||
|
||||
@@ -327,8 +327,8 @@ def parse_project_description(obj):
|
||||
**optional(tar, 'repository'))
|
||||
|
||||
def parse_wheel(whl):
|
||||
assert 'filename' in whl
|
||||
return Wheel(filename=whl['filename'],
|
||||
assert 'pattern' in whl
|
||||
return Wheel(pattern=whl['pattern'],
|
||||
**optional(whl, 'repository'))
|
||||
|
||||
def parse_sdist(sdist):
|
||||
|
||||
@@ -84,7 +84,7 @@ def publish_wheel(info: WheelReleaseInfo, cli: Cli):
|
||||
'upload',
|
||||
'--verbose',
|
||||
'--repository', info.repository,
|
||||
info.filename)
|
||||
info.pattern)
|
||||
print()
|
||||
|
||||
|
||||
|
||||
@@ -19,10 +19,10 @@ artefacts:
|
||||
repository: balls
|
||||
|
||||
- type: wheel
|
||||
filename: './scratch/wheels/*.whl'
|
||||
pattern: './scratch/wheels/*.whl'
|
||||
|
||||
- type: wheel
|
||||
filename: './scratch/wheels/*.whl'
|
||||
pattern: './scratch/wheels/*.whl'
|
||||
repository: other
|
||||
|
||||
- type: sdist
|
||||
|
||||
@@ -30,7 +30,7 @@ class TestProjectDescription(TestCase):
|
||||
version_descriptor='src/python/Cargo.toml',
|
||||
artefacts=[
|
||||
ArtefactDescription(
|
||||
generated=Wheel(filename='./scratch/wheels/*.whl'))
|
||||
generated=Wheel(pattern='./scratch/wheels/*.whl'))
|
||||
])
|
||||
|
||||
# productdesignerd
|
||||
@@ -55,7 +55,7 @@ class TestProjectDescription(TestCase):
|
||||
ArtefactDescription(
|
||||
generated=OciImage(name='masa-images')),
|
||||
ArtefactDescription(
|
||||
generated=Wheel(filename='./scratch/wheels/*.whl'))
|
||||
generated=Wheel(pattern='./scratch/wheels/*.whl'))
|
||||
],
|
||||
deployments=[
|
||||
DeploymentDescription(
|
||||
@@ -134,7 +134,7 @@ class TestProjectDescription(TestCase):
|
||||
artefacts=[
|
||||
ArtefactDescription(
|
||||
version_descriptor='src/python/pyproject.toml',
|
||||
generated=Wheel(filename='./scratch/wheels/*.whl')),
|
||||
generated=Wheel(pattern='./scratch/wheels/*.whl')),
|
||||
ArtefactDescription(generated=OciImage(name='prngl')),
|
||||
],
|
||||
deployments=[
|
||||
@@ -211,9 +211,9 @@ class TestProjectDescription(TestCase):
|
||||
tarball.make_release_info(None, Version(1, 2, 3, 'dev4')))
|
||||
|
||||
def test_wheel_release_info(self):
|
||||
wheel = Wheel(filename='dist/wheels/*')
|
||||
wheel = Wheel(pattern='dist/wheels/*')
|
||||
self.assertEqual(
|
||||
WheelReleaseInfo(filename='dist/wheels/*',
|
||||
WheelReleaseInfo(pattern='dist/wheels/*',
|
||||
repository='gitea',
|
||||
version_str='1.2.3.dev4'),
|
||||
wheel.make_release_info(None, Version(1, 2, 3, 'dev4')))
|
||||
@@ -366,9 +366,9 @@ class TestProjectDescription(TestCase):
|
||||
repository='balls')),
|
||||
|
||||
ArtefactDescription(generated=Wheel(
|
||||
filename='./scratch/wheels/*.whl')),
|
||||
pattern='./scratch/wheels/*.whl')),
|
||||
ArtefactDescription(generated=Wheel(
|
||||
filename='./scratch/wheels/*.whl', repository='other')),
|
||||
pattern='./scratch/wheels/*.whl', repository='other')),
|
||||
|
||||
ArtefactDescription(generated=Sdist(
|
||||
filename='./dist/papyru-0.0.1.tar.gz')),
|
||||
|
||||
@@ -6,23 +6,6 @@ inputs: {}
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: declare project if neccessary
|
||||
run: |
|
||||
if [[ ! -z "${RELEASE_PROJECT_CURRENT_VERSION}" ]]; then
|
||||
echo "already set up."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
nix run ${{ github.action_path }} -- \
|
||||
declare \
|
||||
--release-yaml-filename ".gitea/release.yaml" \
|
||||
--gitea-instance "https://gitea.puzzleyou.net" \
|
||||
--release-repository-name "${{ github.repository }}" \
|
||||
--release-ref-name "${{ github.ref_name }}" \
|
||||
--release-run-number "${{ github.run_number }}" \
|
||||
--release-commit-sha "${{ github.sha }}" \
|
||||
--write-env-vars-to-filename "$GITHUB_ENV"
|
||||
|
||||
- name: sync versions
|
||||
run: |
|
||||
nix run ${{ github.action_path }} -- \
|
||||
|
||||
Reference in New Issue
Block a user