status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "ci: upgrade to GCC 11 to match build outside Docker" 

This reverts commit 38d3b32cb9.
This commit is contained in:
Jakub Sokołowski 2023-06-20 09:25:37 +02:00
parent f17e49fe32
commit 74357faf32
No known key found for this signature in database
GPG Key ID: FE65CD384D5BF7B4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/Dockerfile
View File

@ -41,7 +41,7 @@ RUN apt update -yq && apt install -yq software-properties-common \
&& add-apt-repository -y ppa:ubuntu-toolchain-r/test \ && add-apt-repository -y ppa:ubuntu-toolchain-r/test \
&& apt update -yq && apt full-upgrade -yq && apt install -yq --no-install-recommends --fix-missing \ && 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 \ 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 \ 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 \ zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev unixodbc-dev libpq-dev \
libncurses5-dev libncursesw5-dev libpcsclite-dev libpcre3-dev libnss3 \ 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 \ libxrandr2 libxcursor1 libxi6 libxcb-randr0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 \
libxcb-render-util0 libxcb-shape0 libxcb-render0 libxcb-xinerama0 \ libxcb-render-util0 libxcb-shape0 libxcb-render0 libxcb-xinerama0 \
&& update-alternatives \ && update-alternatives \
--install /usr/bin/gcc gcc /usr/bin/gcc-11 100 \ --install /usr/bin/gcc gcc /usr/bin/gcc-9 100 \
--slave /usr/bin/g++ g++ /usr/bin/g++-11 \ --slave /usr/bin/g++ g++ /usr/bin/g++-9 \
&& apt-get -qq clean && apt-get -qq clean
# Install linuxdeployqt # Install linuxdeployqt

2
ci/Jenkinsfile.linux
View File

@ -8,7 +8,7 @@ pipeline {
/* Necessary image with Ubuntu 18.04 for older Glibc. */ /* Necessary image with Ubuntu 18.04 for older Glibc. */
docker { docker {
label 'linux' 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 */ /* allows jenkins use cat and mounts '/dev/fuse' for linuxdeployqt */
args '--entrypoint="" --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse' args '--entrypoint="" --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse'
} }

2
ci/Jenkinsfile.tests-nim
View File

@ -7,7 +7,7 @@ pipeline {
agent { agent {
docker { docker {
label 'linux' 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'
} }
} }