From ae1bf75769948a6b4423832b06d732158606abbb Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 21 Mar 2024 15:21:01 +1000 Subject: [PATCH] gitlab CI: update to the same b2c image libinput uses Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 6 +++--- .gitlab-ci/ci.template | 2 +- .gitlab-ci/config.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fa58e2..73d04c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -651,8 +651,8 @@ soname: - kvm variables: MESON_BUILDDIR: build_dir - B2C_KERNEL: https://gitlab.freedesktop.org/api/v4/projects/libevdev%2Fhid-tools/packages/generic/kernel-x86_64/v6.1/bzImage - B2C_VERSION: v0.9.9 + B2C_KERNEL: https://gitlab.freedesktop.org/api/v4/projects/libevdev%2Fhid-tools/packages/generic/kernel-x86_64/v6.5/bzImage + B2C_VERSION: 2ff65156ba67fa8a0c309a4fc16c5df1a88a3844 B2C_IMAGE: $FDO_DISTRIBUTION_IMAGE B2C_COMMAND: .gitlab-ci/start-in-systemd.sh script: @@ -660,7 +660,7 @@ soname: - .gitlab-ci/meson-build.sh --skip-test # pull b2c - - curl -L -o /app/boot2container https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/v0.9.9/vm2c.py + - curl -L -o /app/boot2container https://gitlab.freedesktop.org/gfx-ci/boot2container/-/raw/2ff65156ba67fa8a0c309a4fc16c5df1a88a3844/vm2c.py - chmod +x /app/boot2container # runs the test suite only diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index fed6f8a..5917271 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -409,7 +409,7 @@ soname: - .gitlab-ci/meson-build.sh --skip-test # pull b2c - - curl -L -o /app/boot2container https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/{{b2c.version}}/vm2c.py + - curl -L -o /app/boot2container https://gitlab.freedesktop.org/gfx-ci/boot2container/-/raw/{{b2c.version}}/vm2c.py - chmod +x /app/boot2container # runs the test suite only diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 9fe15f6..47257bc 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -122,5 +122,5 @@ distributions: - linux-headers b2c: - version: v0.9.9 - kernel: https://gitlab.freedesktop.org/api/v4/projects/libevdev%2Fhid-tools/packages/generic/kernel-x86_64/v6.1/bzImage + version: 2ff65156ba67fa8a0c309a4fc16c5df1a88a3844 + kernel: https://gitlab.freedesktop.org/api/v4/projects/libevdev%2Fhid-tools/packages/generic/kernel-x86_64/v6.5/bzImage -- 2.34.1