From 74357faf3243baa00de1a1317d195437a7446997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 20 Jun 2023 09:25:37 +0200 Subject: [PATCH] Revert "ci: upgrade to GCC 11 to match build outside Docker" This reverts commit 38d3b32cb9933af08e13a0d9e43ea07842dbc2a6. --- ci/Dockerfile | 6 +++--- ci/Jenkinsfile.linux | 2 +- ci/Jenkinsfile.tests-nim | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 57d262bbd5..d591373005 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -41,7 +41,7 @@ RUN apt update -yq && apt install -yq software-properties-common \ && add-apt-repository -y ppa:ubuntu-toolchain-r/test \ && apt update -yq && apt full-upgrade -yq && apt install -yq --no-install-recommends --fix-missing \ gnupg2 openssh-client ca-certificates locales sudo jq curl wget fuse s3cmd file llvm tk-dev xz-utils \ - git make build-essential pkg-config cmake extra-cmake-modules gcc-11 g++-11 \ + git make build-essential pkg-config cmake extra-cmake-modules gcc-9 g++-9 \ libgl1-mesa-dev libsm6 libice6 libfontconfig1 libdbus-1-3 libssl-dev libz-dev \ zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev unixodbc-dev libpq-dev \ libncurses5-dev libncursesw5-dev libpcsclite-dev libpcre3-dev libnss3 \ @@ -52,8 +52,8 @@ RUN apt update -yq && apt install -yq software-properties-common \ libxrandr2 libxcursor1 libxi6 libxcb-randr0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 \ libxcb-render-util0 libxcb-shape0 libxcb-render0 libxcb-xinerama0 \ && update-alternatives \ - --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-11 \ + --install /usr/bin/gcc gcc /usr/bin/gcc-9 100 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-9 \ && apt-get -qq clean # Install linuxdeployqt diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux index 3bc63c70f2..54ac5446fc 100644 --- a/ci/Jenkinsfile.linux +++ b/ci/Jenkinsfile.linux @@ -8,7 +8,7 @@ pipeline { /* Necessary image with Ubuntu 18.04 for older Glibc. */ docker { label 'linux' - image 'statusteam/nim-status-client-build:1.3.0-qt5.15.2' + image 'statusteam/nim-status-client-build:1.2.2-qt5.15.2' /* allows jenkins use cat and mounts '/dev/fuse' for linuxdeployqt */ args '--entrypoint="" --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse' } diff --git a/ci/Jenkinsfile.tests-nim b/ci/Jenkinsfile.tests-nim index 97d9a8a665..e1f946bb1d 100644 --- a/ci/Jenkinsfile.tests-nim +++ b/ci/Jenkinsfile.tests-nim @@ -7,7 +7,7 @@ pipeline { agent { docker { label 'linux' - image 'statusteam/nim-status-client-build:1.3.0-qt5.15.2' + image 'statusteam/nim-status-client-build:1.2.1-qt5.15.2' } }