1 Commits

Author SHA1 Message Date
1add198c39 WIP
All checks were successful
run tests / check (push) Successful in 22s
run tests / release (push) Successful in 16s
2025-12-09 10:46:05 +01:00
20 changed files with 131 additions and 318 deletions

View File

@@ -1 +1 @@
version_descriptor: setup.py version_descriptor: version.txt

View File

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

View File

@@ -23,70 +23,6 @@ jobs:
- run: set -u; echo "$RELEASE_PROJECT_CURRENT_VERSION" - 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:
- 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/version.txt
- uses: ./check-is-not-released
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: test-declare-with-release-yaml:
runs-on: action-runner runs-on: action-runner
steps: steps:
@@ -100,7 +36,6 @@ jobs:
with: with:
dry_run: true dry_run: true
configure_runner_environment: false configure_runner_environment: false
sync_versions: false
- run: set -u; echo "$RELEASE_PROJECT_CURRENT_VERSION" - run: set -u; echo "$RELEASE_PROJECT_CURRENT_VERSION"
@@ -156,21 +91,12 @@ jobs:
repository: europe-docker.hetzner.cloud/puzzleyou/helm repository: europe-docker.hetzner.cloud/puzzleyou/helm
condition: always condition: always
- name: ensure that default artefact is set - name: ensure that environment variables are set
run: env | grep "RELEASE_IMAGE_LOCAL_NAME_DEFAULT_IMAGE"
- name: ensure that additional artefact is set
run: env | grep "RELEASE_IMAGE_LOCAL_NAME_SOME_DOCKER_IMAGE" run: env | grep "RELEASE_IMAGE_LOCAL_NAME_SOME_DOCKER_IMAGE"
- name: dump release environment variables - name: dump release environment variables
run: env | grep "RELEASE_" run: env | grep "RELEASE_"
- name: check version
run: echo "$RELEASE_PROJECT_CURRENT_VERSION" | grep "1.33.7"
- name: check state file is set
run: set -u; echo "$RELEASE_ACTION_STATEFILE"
- name: dump project description - name: dump project description
uses: ./dump uses: ./dump

View File

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

View File

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

View File

@@ -1,44 +0,0 @@
name: "check not released"
description: "ensure that there is no release with the current version"
inputs:
configure_runner_environment:
required: false
default: true
runs:
using: composite
steps:
- if: inputs.configure_runner_environment == 'true'
uses: https://gitea.puzzleyou.net/actions/configure-runner-environment@master
- 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: check release state
run: |
set +e
if [[ "$RELEASE_PROJECT_IS_RELEASED" = "1" ]]; 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."
fi

View File

@@ -102,23 +102,72 @@ runs:
- if: inputs.configure_runner_environment == 'true' - if: inputs.configure_runner_environment == 'true'
uses: https://gitea.puzzleyou.net/actions/configure-runner-environment@master uses: https://gitea.puzzleyou.net/actions/configure-runner-environment@master
- name: declare release project - name: init action state
run: | run: |
if [[ ! -z "${RELEASE_PROJECT_CURRENT_VERSION}" ]]; then if [[ ! -z "${RELEASE_PROJECT_CURRENT_VERSION}" ]]; then
echo "already set up." echo "already set up."
exit 0 exit 0
fi fi
RELEASE_ACTION_STATEFILE=$(mktemp)
echo "[release] statefile: $RELEASE_ACTION_STATEFILE"
echo "RELEASE_ACTION_STATEFILE="$RELEASE_ACTION_STATEFILE"" \
>> "$GITHUB_ENV"
- name: declare release project
if: inputs.version_descriptor == ''
run: |
if [[ ! -z "${RELEASE_PROJECT_CURRENT_VERSION}" ]]; then
echo "already set up."
exit 0
fi
if [[ "${{ github.ref_name }}" == "master" || "${{ github.ref_name }}" == "main" ]]; then
IS_PRE_RELEASE="0"
else
IS_PRE_RELEASE="1"
fi
nix run ${{ github.action_path }} -- \ nix run ${{ github.action_path }} -- \
declare \ declare \
--state "${RELEASE_ACTION_STATEFILE}" \
--release-yaml-filename "${{ inputs.filename }}" \ --release-yaml-filename "${{ inputs.filename }}" \
--gitea-instance "${{ inputs.gitea_instance }}" \
--release-repository-name "${{ inputs.repository }}" \
--release-ref-name "${{ github.ref_name }}" \
--release-run-number "${{ github.run_number }}" \
--release-commit-sha "${{ github.sha }}" \
--is-pre-release "${IS_PRE_RELEASE}"
nix run ${{ github.action_path }} -- \
dump \
--state "${RELEASE_ACTION_STATEFILE}" \
--write-env-vars-to-filename "$GITHUB_ENV"
- name: declare release project
if: inputs.version_descriptor != ''
run: |
if [[ ! -z "${RELEASE_PROJECT_CURRENT_VERSION}" ]]; then
echo "already set up."
exit 0
fi
if [[ "${{ github.ref_name }}" == "master" || "${{ github.ref_name }}" == "main" ]]; then
IS_PRE_RELEASE="0"
else
IS_PRE_RELEASE="1"
fi
nix run ${{ github.action_path }} -- \
declare \
--state "${RELEASE_ACTION_STATEFILE}" \
--version-descriptor "${{ inputs.version_descriptor }}" \ --version-descriptor "${{ inputs.version_descriptor }}" \
--gitea-instance "${{ inputs.gitea_instance }}" \ --gitea-instance "${{ inputs.gitea_instance }}" \
--release-repository-name "${{ inputs.repository }}" \ --release-repository-name "${{ inputs.repository }}" \
--release-ref-name "${{ github.ref_name }}" \ --release-ref-name "${{ github.ref_name }}" \
--release-run-number "${{ github.run_number }}" \ --release-run-number "${{ github.run_number }}" \
--release-commit-sha "${{ github.sha }}" \ --release-commit-sha "${{ github.sha }}" \
--write-env-vars-to-filename "$GITHUB_ENV" --is-pre-release "${IS_PRE_RELEASE}" \
if [[ ! -z "${{ inputs.artefact_type }}" ]]; then if [[ ! -z "${{ inputs.artefact_type }}" ]]; then
nix run ${{ github.action_path }} -- \ nix run ${{ github.action_path }} -- \
@@ -145,3 +194,8 @@ runs:
--deployment-namespace "${{ inputs.deployment_namespace }}" \ --deployment-namespace "${{ inputs.deployment_namespace }}" \
--deployment-repository "${{ inputs.deployment_repository }}" --deployment-repository "${{ inputs.deployment_repository }}"
fi fi
nix run ${{ github.action_path }} -- \
dump \
--state "${RELEASE_ACTION_STATEFILE}" \
--write-env-vars-to-filename "$GITHUB_ENV"

View File

@@ -18,7 +18,6 @@
toml toml
requests requests
pyyaml pyyaml
packaging
]); ]);
pythonPackage = pkgs.python3Packages.buildPythonPackage { pythonPackage = pkgs.python3Packages.buildPythonPackage {
@@ -45,7 +44,6 @@
requests requests
pythonPackage pythonPackage
pyyaml pyyaml
packaging
]; ];
} }
(builtins.readFile ./src/main.py) (builtins.readFile ./src/main.py)

View File

@@ -24,20 +24,4 @@ test-workflows:
--workflows ./.gitea/workflows/check.yaml \ --workflows ./.gitea/workflows/check.yaml \
--job test-declare-default --job test-declare-default
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-is-not-yet-released
act_runner exec \
--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

View File

@@ -11,21 +11,9 @@ inputs:
required: false required: false
default: true default: true
build_run:
required: false
description: "commands to run before publishing artefacts"
default: ""
sync_versions:
required: false
default: true
runs: runs:
using: composite using: composite
steps: steps:
- if: inputs.configure_runner_environment == 'true'
uses: https://gitea.puzzleyou.net/actions/configure-runner-environment@master
- name: declare project if neccessary - name: declare project if neccessary
run: | run: |
if [[ ! -z "${RELEASE_PROJECT_CURRENT_VERSION}" ]]; then if [[ ! -z "${RELEASE_PROJECT_CURRENT_VERSION}" ]]; then
@@ -33,38 +21,34 @@ runs:
exit 0 exit 0
fi fi
RELEASE_ACTION_STATEFILE=$(mktemp)
echo "[release] statefile: $RELEASE_ACTION_STATEFILE"
echo "RELEASE_ACTION_STATEFILE="$RELEASE_ACTION_STATEFILE"" \
>> "$GITHUB_ENV"
if [[ "${{ github.ref_name }}" == "master" || "${{ github.ref_name }}" == "main" ]]; then
IS_PRE_RELEASE="0"
else
IS_PRE_RELEASE="1"
fi
nix run ${{ github.action_path }} -- \ nix run ${{ github.action_path }} -- \
declare \ declare \
--state "${RELEASE_ACTION_STATEFILE}" \
--release-yaml-filename ".gitea/release.yaml" \ --release-yaml-filename ".gitea/release.yaml" \
--gitea-instance "https://gitea.puzzleyou.net" \ --gitea-instance "https://gitea.puzzleyou.net" \
--release-repository-name "${{ github.repository }}" \ --release-repository-name "${{ github.repository }}" \
--release-ref-name "${{ github.ref_name }}" \ --release-ref-name "${{ github.ref_name }}" \
--release-run-number "${{ github.run_number }}" \ --release-run-number "${{ github.run_number }}" \
--release-commit-sha "${{ github.sha }}" \ --release-commit-sha "${{ github.sha }}" \
--is-pre-release "${IS_PRE_RELEASE}"
nix run ${{ github.action_path }} -- \
dump \
--state "${RELEASE_ACTION_STATEFILE}" \
--write-env-vars-to-filename "$GITHUB_ENV" --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 - name: publish artefacts
if: ${{ steps.check_released.outputs.is_released == '0' }}
run: | run: |
nix run ${{ github.action_path }} -- \ nix run ${{ github.action_path }} -- \
publish-artefacts \ publish-artefacts \
@@ -72,7 +56,6 @@ runs:
--dry-run "${{ inputs.dry_run }}" --dry-run "${{ inputs.dry_run }}"
- name: update deployments - name: update deployments
if: ${{ steps.check_released.outputs.is_released == '0' }}
run: | run: |
nix run ${{ github.action_path }} -- \ nix run ${{ github.action_path }} -- \
update-deployments \ update-deployments \
@@ -80,7 +63,6 @@ runs:
--dry-run "${{ inputs.dry_run }}" --dry-run "${{ inputs.dry_run }}"
- name: create release - name: create release
if: ${{ steps.check_released.outputs.is_released == '0' }}
run: | run: |
nix run ${{ github.action_path }} -- \ nix run ${{ github.action_path }} -- \
create-release \ create-release \

View File

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

View File

@@ -2,8 +2,6 @@ import pickle
import re import re
from argparse import ArgumentParser from argparse import ArgumentParser
from dataclasses import replace from dataclasses import replace
from os import path
from tempfile import gettempdir
from typing import Optional from typing import Optional
import yaml import yaml
@@ -233,29 +231,15 @@ def make_deployment(type: str,
return DeploymentDescription(deployment=deployment, **maybe_condition) 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__': if __name__ == '__main__':
parser = ArgumentParser() parser = ArgumentParser()
parser.add_argument('action', choices=[ parser.add_argument('action', choices=[
# TODO missing: adjust version (development)
# TODO missing: check if release already exists
'declare', 'declare',
'check', 'check',
'add-artefact', 'add-artefact',
'add-deployment', 'add-deployment',
'sync-versions',
'publish-artefacts', 'publish-artefacts',
'update-deployments', 'update-deployments',
'create-release', 'create-release',
@@ -278,7 +262,7 @@ if __name__ == '__main__':
else: else:
raise Exception('flag can be "0" or "1". got: %s' % val) raise Exception('flag can be "0" or "1". got: %s' % val)
parser.add_argument('--state', type=nullable_string) parser.add_argument('--state', required=True)
parser.add_argument('--version-descriptor', type=nullable_string) parser.add_argument('--version-descriptor', type=nullable_string)
parser.add_argument('--release-yaml-filename', type=nullable_string) parser.add_argument('--release-yaml-filename', type=nullable_string)
parser.add_argument('--dry-run', type=true_or_false) parser.add_argument('--dry-run', type=true_or_false)
@@ -312,8 +296,6 @@ if __name__ == '__main__':
parser.add_argument('--write-env-vars-to-filename') parser.add_argument('--write-env-vars-to-filename')
args = parser.parse_args() args = parser.parse_args()
state_file = (args.state
or str(path.join(gettempdir(), 'release_project_state')))
def clean_repository_name(name: str) -> str: def clean_repository_name(name: str) -> str:
if name.startswith('//'): if name.startswith('//'):
@@ -322,22 +304,13 @@ if __name__ == '__main__':
return name return name
if args.action == 'declare': if args.action == 'declare':
if args.version_descriptor is None: if args.release_yaml_filename is None:
project_description = make_project_description(
args.version_descriptor)
else:
with open(args.release_yaml_filename, 'r') as f: with open(args.release_yaml_filename, 'r') as f:
project_description = parse_project_description( project_description = parse_project_description(
yaml.safe_load(f)) yaml.safe_load(f))
else:
project_description = make_project_description(
args.version_descriptor)
if args.is_pre_release is None:
assert args.release_ref_name is not None
is_pre_release = not any(
map(lambda rn: rn in args.release_ref_name,
['master', 'main']))
else:
is_pre_release = args.is_pre_release
project_description = replace( project_description = replace(
project_description, project_description,
@@ -347,12 +320,12 @@ if __name__ == '__main__':
args.release_ref_name, args.release_ref_name,
args.release_run_number, args.release_run_number,
args.release_commit_sha, args.release_commit_sha,
is_pre_release)) args.is_pre_release))
save_project_description(state_file, project_description) save_project_description(args.state, project_description)
elif args.action == 'add-artefact': elif args.action == 'add-artefact':
project_description = load_project_description(state_file) project_description = load_project_description(args.state)
artefact = make_artefact(args.artefact_type, artefact = make_artefact(args.artefact_type,
args.artefact_repository, args.artefact_repository,
@@ -367,10 +340,10 @@ if __name__ == '__main__':
project_description, project_description,
artefacts=project_description.artefacts + [artefact]) artefacts=project_description.artefacts + [artefact])
save_project_description(state_file, project_description) save_project_description(args.state, project_description)
elif args.action == 'add-deployment': elif args.action == 'add-deployment':
project_description = load_project_description(state_file) project_description = load_project_description(args.state)
deployment = make_deployment(args.deployment_type, deployment = make_deployment(args.deployment_type,
args.deployment_release_name, args.deployment_release_name,
@@ -383,46 +356,38 @@ if __name__ == '__main__':
project_description, project_description,
deployments=project_description.deployments + [deployment]) deployments=project_description.deployments + [deployment])
save_project_description(state_file, project_description) save_project_description(args.state, project_description)
elif args.action == 'sync-versions':
project_description = load_project_description(state_file)
sync_versions(project_description)
elif args.action == 'publish-artefacts': elif args.action == 'publish-artefacts':
project_description = load_project_description(state_file) project_description = load_project_description(args.state)
publish_artefacts(project_description, args.dry_run) publish_artefacts(project_description, args.dry_run)
elif args.action == 'update-deployments': elif args.action == 'update-deployments':
project_description = load_project_description(state_file) project_description = load_project_description(args.state)
update_deployments(project_description, args.dry_run) update_deployments(project_description, args.dry_run)
elif args.action == 'create-release': elif args.action == 'create-release':
project_description = load_project_description(state_file) project_description = load_project_description(args.state)
create_release(project_description, args.dry_run) create_release(project_description, args.dry_run)
elif args.action == 'dump': elif args.action == 'dump':
project_description = load_project_description(state_file) project_description = load_project_description(args.state)
dump_project_description(project_description) dump_project_description(project_description)
elif args.action == 'check': elif args.action == 'check':
project_description = load_project_description(state_file) project_description = load_project_description(args.state)
else: else:
raise NotImplementedError() raise NotImplementedError()
assert project_description is not None assert project_description is not None
assert state_file is not None
env_var_filename = args.write_env_vars_to_filename env_var_filename = args.write_env_vars_to_filename
if env_var_filename is not None: if env_var_filename is not None:
env_vars = { env_vars = project_description.environment_variables
'RELEASE_ACTION_STATEFILE': state_file,
**project_description.environment_variables
}
assert not any(map(lambda v: '"' in v, env_vars.values())) assert not any(map(lambda v: '"' in v, env_vars.values()))
with open(env_var_filename, 'a') as f: with open(env_var_filename, 'a') as f:
f.write( f.write(
'\n'.join(map(lambda it: '%s=%s' % it, env_vars.items()))) '\n'.join(map(lambda it: '%s="%s"' % it, env_vars.items())))

View File

@@ -1,12 +0,0 @@
from packaging.version import parse as parse_version
from semver import Version
def python_version_str(version: Version) -> str:
return ('%d.%d.%d' % (version.major, version.minor, version.patch)) \
+ ('' if version.prerelease is None else '.%s' % version.prerelease)
def python_parse_version(txt: str) -> Version:
version = parse_version(txt)
return Version(*version.release, version.pre)

View File

@@ -6,7 +6,6 @@ from itertools import chain
from typing import Optional, Union from typing import Optional, Union
from release import toolkit, versioning from release import toolkit, versioning
from release.common import python_version_str
from release.context import ReleaseContext from release.context import ReleaseContext
from release.versioning import Version from release.versioning import Version
@@ -21,6 +20,11 @@ def _normalize_env_var_fragment(txt: str) -> str:
return txt.upper().replace('-', '_').replace('.', '_') return txt.upper().replace('-', '_').replace('.', '_')
def _python_version_str(version: Version) -> str:
return ('%d.%d.%d' % (version.major, version.minor, version.patch)) \
+ ('' if version.prerelease is None else '.%s' % version.prerelease)
@dataclass(frozen=True) @dataclass(frozen=True)
class OciImageReleaseInfo: class OciImageReleaseInfo:
image_name: str image_name: str
@@ -114,7 +118,7 @@ class Wheel:
return WheelReleaseInfo( return WheelReleaseInfo(
pattern=self.pattern, pattern=self.pattern,
repository=self.repository, repository=self.repository,
version_str=python_version_str(version)) version_str=_python_version_str(version))
@dataclass(frozen=True) @dataclass(frozen=True)
@@ -136,7 +140,7 @@ class Sdist:
return SdistReleaseInfo( return SdistReleaseInfo(
filename=self.filename, filename=self.filename,
repository=self.repository, repository=self.repository,
version_str=python_version_str(version)) version_str=_python_version_str(version))
@dataclass(frozen=True) @dataclass(frozen=True)
@@ -262,7 +266,7 @@ class ProjectDescription:
if self.gitea_tool is None: if self.gitea_tool is None:
return None return None
return self.gitea_tool.is_released(self.project_version) return self.gitea_tool.is_released(self.planned_version)
@cached_property @cached_property
def gitea_tool(self): def gitea_tool(self):
@@ -302,8 +306,6 @@ class ProjectDescription:
str(self.project_version), str(self.project_version),
'RELEASE_PROJECT_PLANNED_VERSION': 'RELEASE_PROJECT_PLANNED_VERSION':
str(self.planned_version), str(self.planned_version),
'RELEASE_PROJECT_IS_RELEASED':
'1' if self.is_released else '0',
}] }]
)) ))

View File

@@ -9,8 +9,6 @@ from release.project import (DeploymentCondition, HelmRelease, HelmReleaseInfo,
SdistReleaseInfo, Tarball, TarballReleaseInfo, SdistReleaseInfo, Tarball, TarballReleaseInfo,
Wheel, WheelReleaseInfo) Wheel, WheelReleaseInfo)
DEFAULT_PACKAGE_OWNER = 'puzzleYOU'
class Cli: class Cli:
def __init__(self, dry_run: bool): def __init__(self, dry_run: bool):
@@ -68,9 +66,8 @@ def publish_tarball(info: TarballReleaseInfo, cli: Cli):
'--upload-file', info.filename, '--upload-file', info.filename,
'-i', '-i',
'-X', 'PUT', '-X', 'PUT',
'%s/api/packages/%s/generic/%s/%s/%s' % ( '%s/api/packages/puzzleYOU/generic/%s/%s/%s' % ( # TODO owner
info.repository, info.repository,
DEFAULT_PACKAGE_OWNER,
info.package_name, info.package_name,
info.version_str, info.version_str,
path.basename(info.filename))) path.basename(info.filename)))
@@ -150,19 +147,19 @@ def update_helm_release(info: HelmReleaseInfo, cli: Cli):
'--version', chart_version, '--version', chart_version,
'-d', td) '-d', td)
chart_filename = '%s/%s-%s.tgz' % (td, chart_name, chart_version) chart_filename = '%s/%s-%s.tgz' % (td, chart_name, chart_version)
value_overrides = ','.join( value_overrides = ','.join(
map(lambda t: '%s=%s' % (t, info.image_tag), info.image_paths)) map(lambda t: '%s=%s' % (t, info.image_tag), info.image_paths))
cli('helm', cli('helm',
'upgrade', info.release_name, 'upgrade', info.release_name,
chart_filename, chart_filename,
'--version', chart_version, '--version', chart_version,
'--namespace', info.namespace, '--namespace', info.namespace,
'--reuse-values', '--reuse-values',
'--set', value_overrides, '--set', value_overrides,
'--timeout', info.timeout) '--timeout', info.timeout)
def update_deployments(project: ProjectDescription, dry_run: bool = False): def update_deployments(project: ProjectDescription, dry_run: bool = False):

View File

@@ -1,6 +1,5 @@
from os import path from os import path
from unittest import TestCase from unittest import TestCase
from unittest.mock import patch
import yaml import yaml
from semver import Version from semver import Version
@@ -15,14 +14,6 @@ from release.project import (ArtefactDescription, DeploymentCondition,
WheelReleaseInfo, parse_project_description) WheelReleaseInfo, parse_project_description)
class MockGiteaTool:
def __init__(self, *args, **kwargs):
pass
def is_released(self, version):
return False
class TestProjectDescription(TestCase): class TestProjectDescription(TestCase):
def test_can_describe_projects(self): def test_can_describe_projects(self):
# resi-lib # resi-lib
@@ -145,7 +136,6 @@ class TestProjectDescription(TestCase):
namespace='prngl-testing')) namespace='prngl-testing'))
]) ])
@patch('release.project.toolkit.Gitea', MockGiteaTool)
def test_environment_variables(self): def test_environment_variables(self):
# motacilla # motacilla
desc = ProjectDescription( desc = ProjectDescription(
@@ -194,7 +184,6 @@ class TestProjectDescription(TestCase):
'RELEASE_IMAGE_LOCAL_NAME_MOTACILLA_CDN': 'RELEASE_IMAGE_LOCAL_NAME_MOTACILLA_CDN':
'motacilla-cdn:0AB123', 'motacilla-cdn:0AB123',
'RELEASE_IS_PRERELEASE': '1', 'RELEASE_IS_PRERELEASE': '1',
'RELEASE_PROJECT_IS_RELEASED': '0',
'RELEASE_PROJECT_CURRENT_VERSION': '2.10.4', 'RELEASE_PROJECT_CURRENT_VERSION': '2.10.4',
'RELEASE_PROJECT_PLANNED_VERSION': '2.10.4-dev42' 'RELEASE_PROJECT_PLANNED_VERSION': '2.10.4-dev42'
} }
@@ -304,12 +293,11 @@ class TestProjectDescription(TestCase):
img.make_release_info(release_context, release_version)) img.make_release_info(release_context, release_version))
def test_project_release_info(self): def test_project_release_info(self):
project_0 = ProjectDescription( project_0 = ProjectDescription(version_descriptor='version.txt')
version_descriptor='test-assets/version.txt')
self.assertIsNone(project_0.release_info) self.assertIsNone(project_0.release_info)
project_pre = ProjectDescription( project_pre = ProjectDescription(
version_descriptor='test-assets/version.txt', version_descriptor='version.txt',
context=ReleaseContext( context=ReleaseContext(
repository_name='resi', repository_name='resi',
ref_name='testing', ref_name='testing',
@@ -320,16 +308,16 @@ class TestProjectDescription(TestCase):
self.assertEqual( self.assertEqual(
ProjectReleaseInfo( ProjectReleaseInfo(
gitea_release_title='Version 1.33.7-dev42', gitea_release_title='Version 0.0.1-dev42',
gitea_release_description='', gitea_release_description='',
gitea_is_prerelease=True, gitea_is_prerelease=True,
gitea_git_commitish='PROBABLY_BROKEN', gitea_git_commitish='PROBABLY_BROKEN',
git_tags=['v1.33.7-dev42', 'development'], git_tags=['v0.0.1-dev42', 'development'],
), ),
project_pre.release_info) project_pre.release_info)
project = ProjectDescription( project = ProjectDescription(
version_descriptor='test-assets/version.txt', version_descriptor='version.txt',
context=ReleaseContext( context=ReleaseContext(
repository_name='resi', repository_name='resi',
ref_name='master', ref_name='master',
@@ -340,11 +328,11 @@ class TestProjectDescription(TestCase):
self.assertEqual( self.assertEqual(
ProjectReleaseInfo( ProjectReleaseInfo(
gitea_release_title='Version 1.33.7', gitea_release_title='Version 0.0.1',
gitea_release_description='', gitea_release_description='',
gitea_is_prerelease=False, gitea_is_prerelease=False,
gitea_git_commitish='PROBABLY_BROKEN', gitea_git_commitish='PROBABLY_BROKEN',
git_tags=['v1.33.7', 'v1.33', 'v1', 'latest'], git_tags=['v0.0.1', 'v0.0', 'v0', 'latest'],
), ),
project.release_info) project.release_info)

View File

@@ -18,12 +18,12 @@ def _test_can_read_version(test, filename, expected):
def _test_can_write_version(test, filename): def _test_can_write_version(test, filename):
v = use_any(_asset_path(filename)) v = use_any(_asset_path(filename))
v.version = Version(1, 33, 7, 42) v.version = Version(1, 33, 7)
with NamedTemporaryFile() as tf: with NamedTemporaryFile() as tf:
v.store(tf.name) v.store(tf.name)
v2 = use_any(tf.name) v2 = use_any(tf.name)
test.assertEqual(v2.version, Version(1, 33, 7, 42)) test.assertEqual(v2.version, Version(1, 33, 7))
class TestSetupPy(TestCase): class TestSetupPy(TestCase):

View File

@@ -6,8 +6,6 @@ from logging import getLogger
import toml import toml
from semver import Version from semver import Version
from release.common import python_parse_version, python_version_str
logger = getLogger(__name__) logger = getLogger(__name__)
RE_SETUP_PY = re.compile(r'version\s?=\s?[\'"](.*)[\'"]') RE_SETUP_PY = re.compile(r'version\s?=\s?[\'"](.*)[\'"]')
@@ -26,13 +24,12 @@ class SetupPy:
self.filename = filename self.filename = filename
self.content = content self.content = content
self.version = python_parse_version(version_string.group(1)) self.version = Version.parse(version_string.group(1))
def store(self, destination=None): def store(self, destination=None):
destination = destination or self.filename destination = destination or self.filename
edited = RE_SETUP_PY.sub( edited = RE_SETUP_PY.sub(
'version=\'%s\'' % python_version_str(self.version), 'version=\'%s\'' % self.version, self.content)
self.content)
with open(destination, 'w') as f: with open(destination, 'w') as f:
f.write(edited) f.write(edited)
@@ -47,7 +44,6 @@ class Structured:
for part in item_path: for part in item_path:
cur = cur[part] cur = cur[part]
self.filename = filename
self.format = format self.format = format
self.item_path = item_path self.item_path = item_path
self.content = obj self.content = obj

View File

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

1
version.txt Normal file
View File

@@ -0,0 +1 @@
0.0.1