The open source OpenXR runtime
ci: Move and rename templates for clearer separation
Avoids having templates in the same place as the files they generate.
Also rename the files that just get included
authored by
Ryan Pavlik
and committed by
Simon Zeni
ac6e9ad4
b0efc5e8
+27
-20
+1
-1
.gitlab-ci.yml
+1
-1
.gitlab-ci.yml
+4
-2
.gitlab-ci/ci-containers-variables.yml.jinja
.gitlab-ci/templates/include.ci-containers-variables.yml.jinja
+4
-2
.gitlab-ci/ci-containers-variables.yml.jinja
.gitlab-ci/templates/include.ci-containers-variables.yml.jinja
···
1
1
{#
2
2
# SPDX-License-Identifier: CC0-1.0
3
3
# SPDX-FileCopyrightText: 2018-2023 Collabora, Ltd. and the Monado contributors
4
+
#
5
+
# This file is not used directly to generate its own output: it is included by .gitlab-ci.yml.jinja
4
6
#}
5
7
6
-
{% from 'functions.jinja' import image_name, image_name_for_comment with context %}
8
+
{% from 'include.functions.jinja' import image_name, image_name_for_comment with context %}
7
9
8
10
{% for distro in distributions -%} {%- for image in distro.images %}
9
11
···
13
15
{% if "codename" in image or "distro_version" in image %}
14
16
FDO_DISTRIBUTION_VERSION: "{{ image["distro_version"] | default(image.codename) }}"
15
17
{% endif %}
16
-
FDO_DISTRIBUTION_TAG: "{{image["tag"]}}"
18
+
FDO_DISTRIBUTION_TAG: "{{ image.tag }}"
17
19
{% if "repo_suffix" in image %}
18
20
FDO_REPO_SUFFIX: {{image["repo_suffix"]}}
19
21
{% endif %}
+4
-2
.gitlab-ci/ci-containers.yml.jinja
.gitlab-ci/templates/include.ci-containers.yml.jinja
+4
-2
.gitlab-ci/ci-containers.yml.jinja
.gitlab-ci/templates/include.ci-containers.yml.jinja
···
1
1
{#
2
2
# SPDX-License-Identifier: CC0-1.0
3
3
# SPDX-FileCopyrightText: 2018-2023 Collabora, Ltd. and the Monado contributors
4
+
#
5
+
# This file is not used directly to generate its own output: it is included by .gitlab-ci.yml.jinja
4
6
#}
5
7
6
-
{% from 'functions.jinja' import image_name, image_name_for_comment with context %}
8
+
{% from 'include.functions.jinja' import image_name, image_name_for_comment with context %}
7
9
8
10
###
9
11
# Container prep jobs
···
27
29
{% endif %}
28
30
{% endfor -%} {%- endfor %}
29
31
30
-
{% from 'functions.jinja' import base_job_to_use_image with context %}
32
+
{% from 'include.functions.jinja' import base_job_to_use_image with context %}
31
33
32
34
###
33
35
# Container usage base jobs
+9
-8
.gitlab-ci/ci-scripts.mk
+9
-8
.gitlab-ci/ci-scripts.mk
···
1
1
# SPDX-License-Identifier: CC0-1.0
2
-
# SPDX-FileCopyrightText: 2022 Collabora, Ltd. and the Monado contributors
2
+
# SPDX-FileCopyrightText: 2022-2023 Collabora, Ltd. and the Monado contributors
3
3
#
4
4
# To generate all the templated files, run this from the root of the repo:
5
5
# make -f .gitlab-ci/ci-scripts.mk
6
6
7
-
# These also all have their template named the same with a .jinja suffix.
7
+
# These also all have their template named the same with a .jinja suffix in the template subdir.
8
8
FILES_IN_SUBDIR := \
9
9
.gitlab-ci/distributions \
10
10
.gitlab-ci/reprepro.sh \
···
24
24
25
25
CI_FAIRY := ci-fairy generate-template --config=$(CONFIG_FILE)
26
26
27
-
# As the default thing for ci-fairy to template, this is special cased
28
-
.gitlab-ci.yml: .gitlab-ci/ci.template .gitlab-ci/win_containers.yml $(CONFIG_FILE)
27
+
# Because we have includes, and it goes to a different directory, this is special cased
28
+
.gitlab-ci.yml: .gitlab-ci/templates/.gitlab-ci.yml.jinja $(CONFIG_FILE)
29
29
$(CI_FAIRY) $< > $@
30
30
# Extra deps
31
-
.gitlab-ci.yml: .gitlab-ci/ci-containers-variables.yml.jinja
32
-
.gitlab-ci.yml: .gitlab-ci/ci-containers.yml.jinja
33
-
.gitlab-ci.yml: .gitlab-ci/functions.jinja
31
+
.gitlab-ci.yml: .gitlab-ci/templates/include.win_containers.yml
32
+
.gitlab-ci.yml: .gitlab-ci/templates/include.ci-containers-variables.yml.jinja
33
+
.gitlab-ci.yml: .gitlab-ci/templates/include.ci-containers.yml.jinja
34
+
.gitlab-ci.yml: .gitlab-ci/templates/include.functions.jinja
34
35
35
36
# Everything else is structured alike
36
-
$(FILES_IN_SUBDIR): %: %.jinja $(CONFIG_FILE)
37
+
$(FILES_IN_SUBDIR): .gitlab-ci/%: .gitlab-ci/templates/%.jinja $(CONFIG_FILE)
37
38
$(CI_FAIRY) $< > $@
+4
-4
.gitlab-ci/ci.template
.gitlab-ci/templates/.gitlab-ci.yml.jinja
+4
-4
.gitlab-ci/ci.template
.gitlab-ci/templates/.gitlab-ci.yml.jinja
···
62
62
- when: never
63
63
64
64
65
-
{% include 'win_containers.yml' %}
66
-
{% include 'ci-containers-variables.yml.jinja' %}
67
-
{% include 'ci-containers.yml.jinja' %}
65
+
{% include 'include.win_containers.yml' %}
66
+
{% include 'include.ci-containers-variables.yml.jinja' %}
67
+
{% include 'include.ci-containers.yml.jinja' %}
68
68
69
-
{% from 'functions.jinja' import image_name, base_job_to_use_image_containing, base_job_to_use_image with context %}
69
+
{% from 'include.functions.jinja' import image_name, base_job_to_use_image_containing, base_job_to_use_image with context %}
70
70
71
71
# Style check job
72
72
format-and-spellcheck:
.gitlab-ci/distributions.jinja
.gitlab-ci/templates/distributions.jinja
.gitlab-ci/distributions.jinja
.gitlab-ci/templates/distributions.jinja
+2
.gitlab-ci/functions.jinja
.gitlab-ci/templates/include.functions.jinja
+2
.gitlab-ci/functions.jinja
.gitlab-ci/templates/include.functions.jinja
···
1
1
{#
2
2
# SPDX-License-Identifier: CC0-1.0
3
3
# SPDX-FileCopyrightText: 2018-2023 Collabora, Ltd. and the Monado contributors
4
+
#
5
+
# This file is not used directly to generate its own output: it is included by .gitlab-ci.yml.jinja
4
6
#}
5
7
6
8
{# Macro to compute job name to extend to use image given a package we want#}
.gitlab-ci/install-android-sdk.sh.jinja
.gitlab-ci/templates/install-android-sdk.sh.jinja
.gitlab-ci/install-android-sdk.sh.jinja
.gitlab-ci/templates/install-android-sdk.sh.jinja
.gitlab-ci/reprepro.sh.jinja
.gitlab-ci/templates/reprepro.sh.jinja
.gitlab-ci/reprepro.sh.jinja
.gitlab-ci/templates/reprepro.sh.jinja
+3
-3
.gitlab-ci/win_containers.yml
.gitlab-ci/templates/include.win_containers.yml
+3
-3
.gitlab-ci/win_containers.yml
.gitlab-ci/templates/include.win_containers.yml
···
1
-
# {# included by ci.template #}
2
-
# {# SPDX-License-Identifier: CC0-1.0 #}
3
-
# {# SPDX-FileCopyrightText: 2018-2022 Collabora, Ltd. and the Monado contributors #}
1
+
# {#- included by .gitlab-ci.yml.jinja #}
2
+
# {#- SPDX-License-Identifier: CC0-1.0 #}
3
+
# {#- SPDX-FileCopyrightText: 2018-2022 Collabora, Ltd. and the Monado contributors #}
4
4
5
5
###
6
6
# Windows container-related jobs (prep and usage)