@@ -44,7 +44,7 @@ variables:
44
44
# Major version dictates which branches share the same ccache. E.g. 10.6-abc
45
45
# and 10.6-xyz will have the same cache.
46
46
MARIADB_MAJOR_VERSION : " 10.5"
47
- # NOTE! Currently ccache is only used on the Centos8 build. As each job has
47
+ # NOTE! Currently ccache is only used on the Centos 9 build. As each job has
48
48
# sufficiently different environments they are unable to benefit from each
49
49
# other's ccaches. As each build generates about 1 GB of ccache, having
50
50
# multiple caches would quickly consume all free storage on Gitlab-CI and
@@ -53,7 +53,7 @@ variables:
53
53
# cache:policy are not flexible enough to have a system where the cache is
54
54
# uploaded only once a week and not on every build. Having ccache on at least
55
55
# one build still helps ensure that ccache compatibility is at least tested
56
- # and if the Centos 8 build is always significantly faster than all other
56
+ # and if the Centos 9 build is always significantly faster than all other
57
57
# builds (e.g. on self-hosted Gitlab instances) then users would at least be
58
58
# able to discover it.
59
59
#
@@ -209,26 +209,20 @@ fedora-sanitizer:
209
209
matrix :
210
210
- SANITIZER : [-DWITH_ASAN=YES, -DWITH_TSAN=YES, -DWITH_UBSAN=YES]
211
211
212
- centos8 :
212
+ centos9 :
213
213
stage : build
214
- image : quay.io/centos/centos:stream8 # CentOS 8 is deprecated, use this Stream8 instead
214
+ image : quay.io/centos/centos:stream9 # CentOS 9 is deprecated, use this Stream9 instead
215
215
variables :
216
216
GIT_STRATEGY : fetch
217
217
GIT_SUBMODULE_STRATEGY : normal
218
218
script :
219
- - yum install -y yum-utils rpm-build openssl-devel pcre2-devel
220
- - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
221
- # dnf --enablerepo=powertools install Judy-devel #--> not found
222
- - dnf config-manager --set-enabled powertools
223
- # Error:
224
- # Problem: conflicting requests
225
- # - package Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.i686 is filtered out by modular filtering
226
- # - package Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64 is filtered out by modular filtering
227
- # Solution: install Judy-devel directly from downloaded rpm file:
228
- - yum install -y http://vault.centos.org/centos/8/PowerTools/x86_64/os/Packages/Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64.rpm
229
- # Use eatmydata to speed up build
230
- - yum install -y https://github.com/stewartsmith/libeatmydata/releases/download/v129/libeatmydata-129-1.fc33.x86_64.rpm
231
- - yum install -y ccache # From EPEL
219
+ - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
220
+ - yum install -y yum-utils rpm-build openssl-devel libeatmydata ccache
221
+ # Install missing dependencies
222
+ - yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/Judy-devel-1.0.5-28.el9.x86_64.rpm
223
+ - yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/bison-devel-3.7.4-5.el9.x86_64.rpm
224
+ - yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/multilib-rpm-config-1-19.el9.noarch.rpm
225
+ # Configure ccache
232
226
- source /etc/profile.d/ccache.sh
233
227
- export CCACHE_DIR="$(pwd)/.ccache"; ccache --zero-stats
234
228
# This repository does not have any .spec files, so install dependencies based on CentOS spec file
0 commit comments