WIP 2

.gitea/workflows/check.yaml

@@ -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:

add-artefact/action.yaml

@@ -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"

declare/action.yaml

@@ -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

dump/action.yaml

@@ -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 }} -- \

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
+        assert pattern is not None
-        generated = Wheel(filename=filename, **maybe_repository)
+        generated = Wheel(pattern=pattern, **maybe_repository)
 
     elif type == 'sdist':
         assert filename is not None
@@ -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)
 

src/release/project.py

@@ -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
+        assert 'pattern' in whl
-        return Wheel(filename=whl['filename'],
+        return Wheel(pattern=whl['pattern'],
                      **optional(whl, 'repository'))
 
     def parse_sdist(sdist):

src/release/release.py

@@ -84,7 +84,7 @@ def publish_wheel(info: WheelReleaseInfo, cli: Cli):
         'upload',
         '--verbose',
         '--repository', info.repository,
-        info.filename)
+        info.pattern)
     print()
 
 

src/release/tests/assets/release.yaml

@@ -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

src/release/tests/project.py

@@ -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')),

sync-versions/action.yaml

@@ -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 }} -- \