diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2022-07-01 14:40:20 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2022-11-16 09:00:25 +1000 |
| commit | 70a79069f177eb90fc8daaea0d586ec069832d6f (patch) | |
| tree | e52f8162dfaa426c6a9be4f646936fbb1f2b7354 /.gitlab-ci | |
| parent | 56b9cac8651469e2e0875357f845a82f9badfa24 (diff) | |
| download | libinput-70a79069f177eb90fc8daaea0d586ec069832d6f.tar.gz | |
gitlab CI: pre-install all packages we need
Running "dnf install" during a job can lead to issues when the image is
old - package renames/replacements/etc. may require a dnf upgrade to get
those packages sorted first before our dnf install works.
This hasn't been a problem for us because we had weekly rebuilds of the
images scheduled and were usually on the latest package set but let's do
this properly anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/ci.template | 7 | ||||
| -rw-r--r-- | .gitlab-ci/config.yml | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 4f16f5c8..70a6fcd1 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -437,8 +437,6 @@ scan-build@{{distro.name}}:{{version}}: variables: NINJA_ARGS: '' MESON_TEST_ARGS: '' - before_script: - - dnf install -y clang-analyzer script: - .gitlab-ci/meson-build.sh - export SCANBUILD="$PWD/.gitlab-ci/scanbuild-wrapper.sh" @@ -527,8 +525,6 @@ usr-bin-env-python@{{distro.name}}:{{version}}: python-format@{{distro.name}}:{{version}}: extends: - .{{distro.name}}-build@template - before_script: - - dnf install -y black script: - black $(git grep -l '^#!/usr/bin/env python3') - git diff --exit-code || (echo "Please run Black against all Python files" && false) @@ -537,8 +533,6 @@ python-format@{{distro.name}}:{{version}}: check-test-suites: extends: - .{{distro.name}}-build@template - before_script: - - dnf install -y jq script: - meson builddir - meson introspect builddir --test | jq -r '.[].name' | grep 'libinput-test-suite' | sort > meson-testsuites @@ -693,7 +687,6 @@ build rpm: needs: - "fedora:36@container-prep" script: - - dnf install -y rpmdevtools jq - meson "$MESON_BUILDDIR" - VERSION=$(meson introspect "$MESON_BUILDDIR" --projectinfo | jq -r .version) - sed -e "s/@PIPELINEID@/${CI_PIPELINE_ID}/" diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index bc5ad956..9e63be33 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -3,7 +3,7 @@ # # We're happy to rebuild all containers when one changes. -.default_tag: &default_tag '2022-11-16.1' +.default_tag: &default_tag '2022-11-16.2' distributions: - name: fedora @@ -35,6 +35,10 @@ distributions: - mtdev-devel - diffutils - wayland-protocols-devel + - black # for the Python black job, optional + - clang-analyzer # for the scan-build job, optional + - jq # for the test suite check job, optional + - rpmdevtools # for the rpm build job, optional - valgrind # for the valgrind run, optional # below packages are for the qemu runs, so optional - systemd-udev # for the qemu run |