WIP

.gitea/workflows/check-is-not-released.yaml

@@ -1,11 +0,0 @@
-name: check if project is already released
-on:
-  - pull_request
-  - push # TODO test
-
-jobs:
-  unittest:
-    runs-on: action-runner
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./check-is-not-released

.gitea/workflows/check.yaml

@@ -23,32 +23,6 @@ jobs:
 
       - run: set -u; echo "$RELEASE_PROJECT_CURRENT_VERSION"
 
-  test-sync-versions:
-    runs-on: action-runner
-    steps:
-      - uses: actions/checkout@v4
-
-      # skip login locally
-      - if: github.repository == 'actions/release'
-        uses: https://gitea.puzzleyou.net/actions/configure-runner-environment@master
-
-      - run: |
-          echo "1.33.7" > /tmp/version-test.txt
-          echo "0.0.42" > /tmp/other-version.txt
-
-      - uses: ./declare
-        with:
-          configure_runner_environment: false
-          version_descriptor: /tmp/version-test.txt
-          artefact_type: oci_image
-          artefact_name: default-image
-          artefact_version_descriptor: /tmp/other-version.txt
-
-      - uses: ./sync-versions
-
-      - run: test "$(cat /tmp/version-test.txt)" = "$RELEASE_PROJECT_PLANNED_VERSION"
-      - run: test "$(cat /tmp/other-version.txt)" = "$RELEASE_PROJECT_PLANNED_VERSION"
-
   test-is-not-yet-released:
     runs-on: action-runner
     steps:
@@ -67,26 +41,6 @@ jobs:
         with:
           configure_runner_environment: false
 
-  test-skip-release-if-already-released:
-    runs-on: action-runner
-    steps:
-      - uses: actions/checkout@v4
-
-      # skip login locally
-      - if: github.repository == 'actions/release'
-        uses: https://gitea.puzzleyou.net/actions/configure-runner-environment@master
-
-      - uses: ./declare
-        with:
-          configure_runner_environment: false
-          version_descriptor: test-assets/Cargo.toml
-
-      - uses: ./release
-        with:
-          configure_runner_environment: false
-          dry_run: true
-          sync_versions: false
-
   test-declare-with-release-yaml:
     runs-on: action-runner
     steps:
@@ -100,7 +54,6 @@ jobs:
         with:
           dry_run: true
           configure_runner_environment: false
-          sync_versions: false
 
       - run: set -u; echo "$RELEASE_PROJECT_CURRENT_VERSION"
 

.gitea/workflows/release.yaml

@@ -14,4 +14,4 @@ jobs:
     runs-on: action-runner
     steps:
       - uses: actions/checkout@v4
-      - uses: ./
+      - uses: ./release

action.yaml

@@ -1 +0,0 @@
-release/action.yaml

check-is-not-released/action.yaml

@@ -33,11 +33,15 @@ runs:
       run: |
         set +e
 
-        if [[ "$RELEASE_PROJECT_IS_RELEASED" = "1" ]]; then
+        nix run ${{ github.action_path }} -- \
+          dump \
+          --state "${RELEASE_ACTION_STATEFILE}" \
+          | grep "is already released: True"
+        IS_RELEASED_EXIT_CODE=$?
+
+        if [[ "$IS_RELEASED_EXIT_CODE" -eq 0 ]]; then
           VERSION="$RELEASE_PROJECT_CURRENT_VERSION"
           echo "Project is already released with version ${VERSION}."
-          echo "You should increment the project version."
-          echo "If you don't, then the project will not be released."
           exit -1
         else
           echo "Project is not yet released."

declare/action.yaml

@@ -104,11 +104,6 @@ runs:
 
     - name: declare release project
       run: |
-        if [[ ! -z "${RELEASE_PROJECT_CURRENT_VERSION}" ]]; then
-          echo "already set up."
-          exit 0
-        fi
-
         nix run ${{ github.action_path }} -- \
           declare \
           --release-yaml-filename "${{ inputs.filename }}" \

justfile

@@ -30,14 +30,4 @@ test-workflows:
     --workflows ./.gitea/workflows/check.yaml \
     --job test-is-not-yet-released
 
-  act_runner exec \
+  # --image "europe-docker.pkg.dev/puzzle-and-play/docker/action-runner-job:latest" \
-    --image "-self-hosted" \
-    --event pull_request \
-    --workflows ./.gitea/workflows/check.yaml \
-    --job test-skip-release-if-already-released
-
-  act_runner exec \
-    --image "-self-hosted" \
-    --event pull_request \
-    --workflows ./.gitea/workflows/check.yaml \
-    --job test-sync-versions

release/action.yaml

@@ -11,15 +11,6 @@ inputs:
     required: false
     default: true
 
-  build_run:
-    required: false
-    description: "commands to run before publishing artefacts"
-    default: ""
-
-  sync_versions:
-    required: false
-    default: true
-
 runs:
   using: composite
   steps:
@@ -43,28 +34,7 @@ runs:
           --release-commit-sha "${{ github.sha }}" \
           --write-env-vars-to-filename "$GITHUB_ENV"
 
-    - name: check if already released
-      id: check_released
-      run: |
-        if [[ "$RELEASE_PROJECT_IS_RELEASED" == "1" ]] && [[ "$RELEASE_IS_PRERELEASE" == "0" ]]; then
-          echo "is_released=1" >> "$GITHUB_OUTPUT"
-        else
-          echo "is_released=0" >> "$GITHUB_OUTPUT"
-        fi
-
-    - name: sync versions
-      if: ${{ steps.check_released.outputs.is_released == '0' && inputs.sync_versions == 'true' }}
-      run: |
-        nix run ${{ github.action_path }} -- \
-          sync-versions \
-          --state "${RELEASE_ACTION_STATEFILE}"
-
-    - name: run build commands
-      if: ${{ steps.check_released.outputs.is_released == '0' && inputs.build_run != '' }}
-      run: ${{ inputs.build_run }}
-
     - name: publish artefacts
-      if: ${{ steps.check_released.outputs.is_released == '0' }}
       run: |
         nix run ${{ github.action_path }} -- \
           publish-artefacts \
@@ -72,7 +42,6 @@ runs:
           --dry-run "${{ inputs.dry_run }}"
 
     - name: update deployments
-      if: ${{ steps.check_released.outputs.is_released == '0' }}
       run: |
         nix run ${{ github.action_path }} -- \
           update-deployments \
@@ -80,7 +49,6 @@ runs:
           --dry-run "${{ inputs.dry_run }}"
 
     - name: create release
-      if: ${{ steps.check_released.outputs.is_released == '0' }}
       run: |
         nix run ${{ github.action_path }} -- \
           create-release \

setup.py

@@ -2,5 +2,5 @@ from setuptools import setup
 
 setup(
     name='release-action',
-    version='0.0.2',
+    version='0.0.1.dev0',
 )

src/main.py

@@ -233,29 +233,15 @@ def make_deployment(type: str,
     return DeploymentDescription(deployment=deployment, **maybe_condition)
 
 
-def sync_versions(project_description: ProjectDescription):
-    planned_version = project_description.planned_version
-
-    def sync(descriptor_filename: str):
-        v = versioning.use_any(descriptor_filename)
-        v.version = planned_version
-        v.store()
-
-    sync(project_description.version_descriptor)
-
-    for artefact in project_description.artefacts:
-        if artefact.version_descriptor is not None:
-            sync(artefact.version_descriptor)
-
-
 if __name__ == '__main__':
     parser = ArgumentParser()
     parser.add_argument('action', choices=[
+        # TODO missing: adjust version (development)
+        # TODO missing: check if release already exists
         'declare',
         'check',
         'add-artefact',
         'add-deployment',
-        'sync-versions',
         'publish-artefacts',
         'update-deployments',
         'create-release',
@@ -385,10 +371,6 @@ if __name__ == '__main__':
 
         save_project_description(state_file, project_description)
 
-    elif args.action == 'sync-versions':
-        project_description = load_project_description(state_file)
-        sync_versions(project_description)
-
     elif args.action == 'publish-artefacts':
         project_description = load_project_description(state_file)
         publish_artefacts(project_description, args.dry_run)

src/release/project.py

@@ -262,7 +262,7 @@ class ProjectDescription:
         if self.gitea_tool is None:
             return None
 
-        return self.gitea_tool.is_released(self.project_version)
+        return self.gitea_tool.is_released(self.planned_version)
 
     @cached_property
     def gitea_tool(self):
@@ -302,8 +302,6 @@ class ProjectDescription:
                         str(self.project_version),
                     'RELEASE_PROJECT_PLANNED_VERSION':
                         str(self.planned_version),
-                    'RELEASE_PROJECT_IS_RELEASED':
-                        '1' if self.is_released else '0',
                 }]
             ))
 

src/release/release.py

@@ -9,8 +9,6 @@ from release.project import (DeploymentCondition, HelmRelease, HelmReleaseInfo,
                              SdistReleaseInfo, Tarball, TarballReleaseInfo,
                              Wheel, WheelReleaseInfo)
 
-DEFAULT_PACKAGE_OWNER = 'puzzleYOU'
-
 
 class Cli:
     def __init__(self, dry_run: bool):
@@ -68,9 +66,8 @@ def publish_tarball(info: TarballReleaseInfo, cli: Cli):
         '--upload-file', info.filename,
         '-i',
         '-X', 'PUT',
-        '%s/api/packages/%s/generic/%s/%s/%s' % (
+        '%s/api/packages/puzzleYOU/generic/%s/%s/%s' % (  # TODO owner
             info.repository,
-            DEFAULT_PACKAGE_OWNER,
             info.package_name,
             info.version_str,
             path.basename(info.filename)))

src/release/tests/project.py

@@ -1,6 +1,5 @@
 from os import path
 from unittest import TestCase
-from unittest.mock import patch
 
 import yaml
 from semver import Version
@@ -15,14 +14,6 @@ from release.project import (ArtefactDescription, DeploymentCondition,
                              WheelReleaseInfo, parse_project_description)
 
 
-class MockGiteaTool:
-    def __init__(self, *args, **kwargs):
-        pass
-
-    def is_released(self, version):
-        return False
-
-
 class TestProjectDescription(TestCase):
     def test_can_describe_projects(self):
         # resi-lib
@@ -145,7 +136,6 @@ class TestProjectDescription(TestCase):
                         namespace='prngl-testing'))
             ])
 
-    @patch('release.project.toolkit.Gitea', MockGiteaTool)
     def test_environment_variables(self):
         # motacilla
         desc = ProjectDescription(
@@ -194,7 +184,6 @@ class TestProjectDescription(TestCase):
                 'RELEASE_IMAGE_LOCAL_NAME_MOTACILLA_CDN':
                     'motacilla-cdn:0AB123',
                 'RELEASE_IS_PRERELEASE': '1',
-                'RELEASE_PROJECT_IS_RELEASED': '0',
                 'RELEASE_PROJECT_CURRENT_VERSION': '2.10.4',
                 'RELEASE_PROJECT_PLANNED_VERSION': '2.10.4-dev42'
             }

src/release/versioning.py

@@ -47,7 +47,6 @@ class Structured:
         for part in item_path:
             cur = cur[part]
 
-        self.filename = filename
         self.format = format
         self.item_path = item_path
         self.content = obj

sync-versions/action.yaml

@@ -1,13 +0,0 @@
-name: "sync version descriptors"
-description: "update all version descriptors to the planned version."
-
-inputs: {}
-
-runs:
-  using: composite
-  steps:
-    - name: sync versions
-      run: |
-        nix run ${{ github.action_path }} -- \
-          sync-versions \
-          --state "${RELEASE_ACTION_STATEFILE}"