summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorDavid Heidelberg <david.heidelberg@collabora.com>2023-03-20 22:41:30 +0100
committerMarge Bot <emma+marge@anholt.net>2023-03-23 11:19:56 +0000
commit781c088d928c1ae95859f605a16d65d84ff1ab38 (patch)
tree5d0b5b94abb2288ddd12db4ad194f330f13e0dfd /.gitlab-ci
parent2413cb2965928f8927ae8d3d4d4d90fc64e034f8 (diff)
ci: bump Alpine to 3.17 (again)
Now with fixed ccache 4.7.5. `ccache` changelog: Disabled the inode cache by default again since there have reports of ccache processes hanging on futex calls related to the inode cache. Signed-off-by: David Heidelberg <david.heidelberg@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22037>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/container/gitlab-ci.yml2
-rw-r--r--.gitlab-ci/image-tags.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 70f73b07bcb..f4ac6c1235a 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -280,7 +280,7 @@ alpine/x86_build:
- .fdo.container-build@alpine
- .container
variables:
- FDO_DISTRIBUTION_VERSION: "3.16"
+ FDO_DISTRIBUTION_VERSION: "3.17"
MESA_IMAGE_TAG: &alpine-x86_build ${ALPINE_X86_BUILD_TAG}
.use-alpine/x86_build:
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 2406fec7ddc..b09aa478a41 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -19,7 +19,7 @@ variables:
DEBIAN_X86_TEST_GL_TAG: "2023-03-20-piglit-60e7f058"
DEBIAN_X86_TEST_VK_TAG: "2023-03-20-piglit-60e7f058"
- ALPINE_X86_BUILD_TAG: "2023-02-26-add-bash-coreutils"
+ ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump"
FEDORA_X86_BUILD_TAG: "2023-03-13-procps-ng"
KERNEL_ROOTFS_TAG: "2023-03-20-piglit-60e7f058"