Skip to content

Commit 7576d27

Browse files
committed
fix: make git info optional if missing
1 parent e489d3d commit 7576d27

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

tile_generator/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ def _find_git_root():
7171
except subprocess.CalledProcessError as e:
7272
return e
7373

74-
7574
# Inspired by https://gist.github.com/angstwad/bf22d1822c38a92ec0a9
7675
def merge_dict(dct, merge_dct):
7776
for k, v in merge_dct.items():
@@ -182,12 +181,13 @@ def _validate_base_config(self):
182181
'description': {'type': 'string', 'required': True},
183182
'icon_file': {'type': 'string', 'required': True, 'coerce': _base64_img},
184183
'metadata_version': {'type': 'number', 'default': 1.8},
185-
'git_remotes': {'type': 'list', 'schema': {
184+
'git_remotes': {'type': 'list', 'required': False, 'schema': {
186185
'type': 'dict', 'schema': {
187186
'name': {'type': 'string', 'required': True},
188187
'urls': {'type': 'list', 'required': True},
189188
}
190189
}},
190+
'git_sha': {'type': 'string', 'required': False},
191191
'stemcell_criteria': {'type': 'dict', 'default': self.default_stemcell(), 'schema': {
192192
'os': {'type': 'string'}, 'version': {'type': 'string'}}},
193193
'release_overides': {'type': 'dict'},

tile_generator/templates/tile/metadata.yml

+8
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,11 @@ update:
5252
provides_product_versions:
5353
- name: {{ tile_metadata.base.name }}
5454
version: '{{ tile_metadata.base.product_version }}'
55+
56+
{% if tile_metadata.git_sha %}
57+
git_sha: {{ tile_metadata.git_sha }}
58+
{% endif %}
59+
{% if tile_metadata.git_remotes %}
60+
git_remotes:
61+
{{ tile_metadata.git_remotes | yaml }}
62+
{% endif %}

0 commit comments

Comments
 (0)