mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 10:36:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: bump our templates and ci-fairy version, some cleanup

Browse source
This commit is contained in:
Ryan Pavlik 2023-11-14 11:50:38 -06:00 committed by Simon Zeni
parent 6746ddbc5b
commit 2b418abf3f
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitlab-ci.yml
View file

@ -18,7 +18,7 @@ variables:
include: include:
- project: "freedesktop/ci-templates" - project: "freedesktop/ci-templates"
ref: 7811ba9814a3bad379377241c6c6b62d78b20eac ref: 185ede0e9b9b1924b92306ab8b882a6294e92613
file: file:
- "/templates/debian.yml" - "/templates/debian.yml"
- "/templates/ubuntu.yml" - "/templates/ubuntu.yml"
@ -45,7 +45,7 @@ stages:
- when: never - when: never
# # # # # #
### ###
# Windows container-related jobs (prep and usage) # Windows container-related jobs (prep and usage)
@ -122,6 +122,8 @@ win:container_prep:
- .build-rules - .build-rules
image: $MONADO_IMAGE image: $MONADO_IMAGE
# Variables for build and usage of Debian bullseye image # Variables for build and usage of Debian bullseye image
.monado.variables.debian:bullseye: .monado.variables.debian:bullseye:
variables: variables:
@ -153,6 +155,7 @@ win:container_prep:
FDO_DISTRIBUTION_VERSION: "rolling" FDO_DISTRIBUTION_VERSION: "rolling"
FDO_DISTRIBUTION_TAG: "2023-05-22.0" FDO_DISTRIBUTION_TAG: "2023-05-22.0"
### ###
# Container prep jobs # Container prep jobs
# Make Debian bullseye image # Make Debian bullseye image

2
.gitlab-ci/README.md
View file

@ -16,7 +16,7 @@ You can install it with:
<!-- do not break the following line, it is used in CI setup too, to make sure it works --> <!-- do not break the following line, it is used in CI setup too, to make sure it works -->
```sh ```sh
python3 -m pip install git+https://gitlab.freedesktop.org/freedesktop/ci-templates@9f0eb526291fe74651fe1430cbd2397f4c0a819b python3 -m pip install git+https://gitlab.freedesktop.org/freedesktop/ci-templates@185ede0e9b9b1924b92306ab8b882a6294e92613
``` ```
On Windows you will also need to have GNU make and busybox installed, such as with: On Windows you will also need to have GNU make and busybox installed, such as with:

2
.gitlab-ci/config.yml
View file

@ -4,7 +4,7 @@
# Please run the following from the repo root after modifying this file: # Please run the following from the repo root after modifying this file:
# make -f .gitlab-ci/ci-scripts.mk # make -f .gitlab-ci/ci-scripts.mk
fdo_ci_templates_sha: 7811ba9814a3bad379377241c6c6b62d78b20eac fdo_ci_templates_sha: 185ede0e9b9b1924b92306ab8b882a6294e92613
# These are a mapping, instead of a list/array, so we can merge. # These are a mapping, instead of a list/array, so we can merge.
.default_debian_packages: .default_debian_packages: