Skip to content

Commit 73ddb41

Browse files
authored
Merge pull request #5450 from inikep/PS-9455-8.0
PS-9455 [8.0]: Add gcc-14 to Azure Pipelines + remove gcc-14 from Cirrus CI
2 parents a634d87 + 669b337 commit 73ddb41

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

.cirrus.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ script_template: &SCRIPT_TEMPLATE
108108
NPROC=`nproc --all`
109109
NTHREADS=$(( $NPROC > 16 ? 16 : $NPROC ))
110110
if [[ "$BUILD_TYPE" == "RelWithDebInfo" ]]; then
111-
MTR_TESTS="--suite=main"
111+
MTR_TESTS="--suite=binlog_nogtid"
112112
else
113113
MTR_TESTS="main.1st"
114114
fi
@@ -166,7 +166,8 @@ task:
166166
task:
167167
<< : *FILTER_TEMPLATE
168168
# run only on "percona/percona-server" but not on "8.0" as we have nightly cron builds for "8.0" branch
169-
only_if: "$CIRRUS_CRON != '' || $CIRRUS_REPO_FULL_NAME == 'percona/percona-server' && $CIRRUS_BRANCH != '8.0' && !changesIncludeOnly('doc/*', 'build-ps/*', 'man/*', 'mysql-test/*', 'packaging/*', 'policy/*', 'scripts/*', 'support-files/*')"
169+
# only_if: "$CIRRUS_CRON != '' || $CIRRUS_REPO_FULL_NAME == 'percona/percona-server' && $CIRRUS_BRANCH != '8.0' && !changesIncludeOnly('doc/*', 'build-ps/*', 'man/*', 'mysql-test/*', 'packaging/*', 'policy/*', 'scripts/*', 'support-files/*')"
170+
only_if: false # DISABLED
170171
aws_credentials: ENCRYPTED[!f57794979d3ed96943cd39073b66a4fffbdc3ee6366b265e68c5aae890961d171bddca50bf169cc07db56c8c68172b84!]
171172
ec2_instance:
172173
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-2024061*"

azure-pipelines.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,12 +291,25 @@ jobs:
291291

292292

293293
# gcc-7 and newer compilers
294-
gcc-13 RelWithDebInfo [Ubuntu 22.04 Jammy]:
295-
imageName: 'ubuntu-22.04'
294+
gcc-14 RelWithDebInfo [Ubuntu 24.04 Noble]:
295+
imageName: 'ubuntu-24.04'
296296
Compiler: gcc
297-
CompilerVer: 13
297+
CompilerVer: 14
298298
BuildType: RelWithDebInfo
299299

300+
gcc-14 Debug [Ubuntu 24.04 Noble]:
301+
imageName: 'ubuntu-24.04'
302+
Compiler: gcc
303+
CompilerVer: 14
304+
BuildType: Debug
305+
306+
${{ if or(ne(variables['Build.Reason'], 'PullRequest'), contains(variables['Build.SourceBranchName'], 'fullci')) }}:
307+
gcc-13 RelWithDebInfo [Ubuntu 22.04 Jammy]:
308+
imageName: 'ubuntu-22.04'
309+
Compiler: gcc
310+
CompilerVer: 13
311+
BuildType: RelWithDebInfo
312+
300313
gcc-13 Debug [Ubuntu 22.04 Jammy]:
301314
imageName: 'ubuntu-22.04'
302315
Compiler: gcc
@@ -419,7 +432,7 @@ jobs:
419432
sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
420433
sudo -E apt-get -yq update >> ~/apt-get-update.log 2>&1
421434
422-
sudo -E apt-get -yq --no-install-suggests --no-install-recommends --allow-unauthenticated install $PACKAGES cmake cmake-curses-gui ccache bison libudev-dev libaio-dev libmecab-dev libnuma-dev libssl-dev libreadline-dev libedit-dev libpam-dev libcurl4-openssl-dev libldap2-dev libkrb5-dev libsasl2-dev libsasl2-modules-gssapi-mit || exit 1;
435+
sudo -E apt-get -yq --no-install-suggests --no-install-recommends --allow-unauthenticated install $PACKAGES cmake cmake-curses-gui ccache bison libtirpc-dev libudev-dev libaio-dev libmecab-dev libnuma-dev libssl-dev libreadline-dev libedit-dev libpam-dev libcurl4-openssl-dev libldap2-dev libkrb5-dev libsasl2-dev libsasl2-modules-gssapi-mit || exit 1;
423436
`# SYSTEM_LIBRARIES = CURL EDITLINE ICU LIBEVENT LZ4 PROTOBUF SSL ZSTD FIDO (Ubuntu 21.04+)`
424437
if [[ "$(BUILD_PARAMS_TYPE)" != "inverted" ]]; then
425438
sudo -E apt-get -yq --no-install-suggests --no-install-recommends --allow-unauthenticated install libicu-dev libevent-dev liblz4-dev zlib1g-dev protobuf-compiler libprotobuf-dev libprotoc-dev libzstd-dev libfido2-dev || exit 1;

0 commit comments

Comments
 (0)