From: Pavel Hrdina Date: Tue, 18 Feb 2025 18:16:01 +0000 (+0100) Subject: ci: refresh with 'lcitool manifest' X-Git-Tag: v11.2.0-rc1~287 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bd83854f708c62b7966ef74740aed0d5b23d5a7;p=thirdparty%2Flibvirt.git ci: refresh with 'lcitool manifest' Replace Alpine Linux v3.19 with v3.21. Signed-off-by: Pavel Hrdina Reviewed-by: Martin Kletzander --- diff --git a/ci/buildenv/alpine-319.sh b/ci/buildenv/alpine-321.sh similarity index 100% rename from ci/buildenv/alpine-319.sh rename to ci/buildenv/alpine-321.sh diff --git a/ci/containers/alpine-319.Dockerfile b/ci/containers/alpine-321.Dockerfile similarity index 98% rename from ci/containers/alpine-319.Dockerfile rename to ci/containers/alpine-321.Dockerfile index 2e4842ef3e..2351b03653 100644 --- a/ci/containers/alpine-319.Dockerfile +++ b/ci/containers/alpine-321.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.19 +FROM docker.io/library/alpine:3.21 RUN apk update && \ apk upgrade && \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 9c2f0ecad8..0534a2278d 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -33,15 +33,15 @@ x86_64-almalinux-9-clang: TARGET_BASE_IMAGE: docker.io/library/almalinux:9 -x86_64-alpine-319: +x86_64-alpine-321: extends: .native_build_job needs: - - job: x86_64-alpine-319-container + - job: x86_64-alpine-321-container optional: true allow_failure: false variables: - NAME: alpine-319 - TARGET_BASE_IMAGE: docker.io/library/alpine:3.19 + NAME: alpine-321 + TARGET_BASE_IMAGE: docker.io/library/alpine:3.21 x86_64-alpine-edge: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 0cfc8ca952..0e86062652 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -14,11 +14,11 @@ x86_64-almalinux-9-container: NAME: almalinux-9 -x86_64-alpine-319-container: +x86_64-alpine-321-container: extends: .container_job allow_failure: false variables: - NAME: alpine-319 + NAME: alpine-321 x86_64-alpine-edge-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 2c036aaa39..3bfebed96c 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -19,7 +19,7 @@ targets: RPM: skip CC: clang - alpine-319: x86_64 + alpine-321: x86_64 alpine-edge: jobs: