diff --git a/project_manager/common/command.py b/project_manager/common/command.py index fcc9cd7..3220812 100644 --- a/project_manager/common/command.py +++ b/project_manager/common/command.py @@ -50,6 +50,7 @@ class CommandExecutor: try: result = subprocess.run( self._command, + executable="bash", cwd=basepath, stdout=out_logger, # type: ignore stderr=err_logger, # type: ignore diff --git a/project_manager/common/template.py b/project_manager/common/template.py index c6cb9f6..cc66e2c 100644 --- a/project_manager/common/template.py +++ b/project_manager/common/template.py @@ -99,6 +99,8 @@ class PathTemplate: kk: self._env.from_string(vv).render(**variables) for kk, vv in v.items() } + elif isinstance(v, list): + variables[k] = [self._env.from_string(vv).render(**variables) for vv in v] else: variables[k] = self._env.from_string(v).render(**variables) diff --git a/project_manager/preset/default/docker.toml b/project_manager/preset/default/docker.toml index 1ec9eb1..8e58fbf 100644 --- a/project_manager/preset/default/docker.toml +++ b/project_manager/preset/default/docker.toml @@ -7,11 +7,15 @@ variables.docker_group = "{{ 'DOCKER_GROUP' | env }}" variables.docker_image = "{% if docker_group | bool %}{{ docker_group }}/{% endif %}{{ docker_name }}" variables.docker_tag = "{{ 'DOCKER_TAG' | env('latest') }}" variables.docker_target = "{{ 'DOCKER_TARGET' | env }}" -variables.docker_target_arg = "{{ ('--target ' + docker_target) if docker_target else '' }}" +variables.docker_target_str = "{{ ('--target ' + docker_target) if docker_target else '' }}" +variables.docker_build_args = {} +variables.docker_build_args_str = "{% for item in docker_build_args.items() %}--build-arg \"{{ item[0] }}={{ item[1] }}\" {% endfor %}" # build [presets.docker.tasks.build.default] -commands = ["docker build {{ docker_target_arg }} -t {{ docker_image }} . -f Dockerfile"] +commands = [ + "docker build {{ docker_build_args_str }} {{ docker_target_str }} -t {{ docker_image }} . -f Dockerfile", +] # publish version [presets.docker.tasks.publish.version] diff --git a/project_manager/preset/default/global.toml b/project_manager/preset/default/global.toml index 04d66bb..e8b3f4e 100644 --- a/project_manager/preset/default/global.toml +++ b/project_manager/preset/default/global.toml @@ -4,4 +4,5 @@ conditions = ["{{ true }}"] variables.project_name = "{{ 'pyproject.toml' | read | get('project.name') or 'package.json' | read | get('name') }}" variables.project_version = "{{ 'pyproject.toml' | read | get('project.version') or 'package.json' | read | get('version') }}" variables.version = "{{ 'version' | env }}" +variables.home = "{{ 'home' | env }}" tasks = {} diff --git a/project_manager/preset/default/haxe.toml b/project_manager/preset/default/haxe.toml new file mode 100644 index 0000000..91efd12 --- /dev/null +++ b/project_manager/preset/default/haxe.toml @@ -0,0 +1,23 @@ +[presets.haxe] +variables.haxe_version_default = "{{ 'package.json' | read | get('haxe') or '4.2.5' }}" +variables.haxe_version = "{{ 'HAXE_VERSION' | env(haxe_version_default) }}" +variables.neko_version_default = "{{ 'package.json' | read | get('neko') or '2.2.0' }}" +variables.neko_version = "{{ 'NEKO_VERSION' | env(neko_version_default) }}" +variables.neko_sdk = "{{ 'NEKO_SDK' | env(home + '/sdk/neko/' + neko_version) }}" +variables.haxe_sdk = "{{ 'HAXE_SDK' | env(home + '/sdk/haxe/' + haxe_version) }}" +variables.haxe_activate = ". {{ neko_sdk }}/activate && . {{ haxe_sdk }}/activate &&" +variables.haxe_sources = [] +variables.haxe_sources_str = "{% for item in haxe_sources %}-s \"{{ item }}\" {% endfor %}" +conditions = ["{{ haxe_sdk | file }}"] + +[presets.haxe.tasks.lint.formatter] +conditions = ["{{ (haxe_sdk + '/lib/formatter') | file }}"] +commands = [ + "{{ haxe_activate }} haxelib run formatter --check {{ haxe_sources_str or '.' }}", +] + +[presets.haxe.tasks.format.formatter] +conditions = ["{{ (haxe_sdk + '/lib/formatter') | file }}"] +commands = [ + "{{ haxe_activate }} haxelib run formatter {{ haxe_sources_str or '.' }}", +]