The open source OpenXR runtime
ci: bump our templates and ci-fairy version, some cleanup
authored by
Ryan Pavlik
and committed by
Simon Zeni
2b418abf
6746ddbc
+7
-4
+5
-2
.gitlab-ci.yml
+5
-2
.gitlab-ci.yml
···
18
18
19
19
include:
20
20
- project: "freedesktop/ci-templates"
21
-
ref: 7811ba9814a3bad379377241c6c6b62d78b20eac
21
+
ref: 185ede0e9b9b1924b92306ab8b882a6294e92613
22
22
file:
23
23
- "/templates/debian.yml"
24
24
- "/templates/ubuntu.yml"
···
45
45
- when: never
46
46
47
47
48
-
# # #
48
+
# # #
49
49
###
50
50
# Windows container-related jobs (prep and usage)
51
51
···
122
122
- .build-rules
123
123
image: $MONADO_IMAGE
124
124
125
+
126
+
125
127
# Variables for build and usage of Debian bullseye image
126
128
.monado.variables.debian:bullseye:
127
129
variables:
···
152
154
variables:
153
155
FDO_DISTRIBUTION_VERSION: "rolling"
154
156
FDO_DISTRIBUTION_TAG: "2023-05-22.0"
157
+
155
158
156
159
###
157
160
# Container prep jobs
+1
-1
.gitlab-ci/README.md
+1
-1
.gitlab-ci/README.md
···
16
16
17
17
<!-- do not break the following line, it is used in CI setup too, to make sure it works -->
18
18
```sh
19
-
python3 -m pip install git+https://gitlab.freedesktop.org/freedesktop/ci-templates@9f0eb526291fe74651fe1430cbd2397f4c0a819b
19
+
python3 -m pip install git+https://gitlab.freedesktop.org/freedesktop/ci-templates@185ede0e9b9b1924b92306ab8b882a6294e92613
20
20
```
21
21
22
22
On Windows you will also need to have GNU make and busybox installed, such as with:
+1
-1
.gitlab-ci/config.yml
+1
-1
.gitlab-ci/config.yml
···
4
4
# Please run the following from the repo root after modifying this file:
5
5
# make -f .gitlab-ci/ci-scripts.mk
6
6
7
-
fdo_ci_templates_sha: 7811ba9814a3bad379377241c6c6b62d78b20eac
7
+
fdo_ci_templates_sha: 185ede0e9b9b1924b92306ab8b882a6294e92613
8
8
9
9
# These are a mapping, instead of a list/array, so we can merge.
10
10
.default_debian_packages: