From 9b0c37c9a3640b3168901268b0894b7d37dee385 Mon Sep 17 00:00:00 2001
From: Bartosz Cichocki <bartosz.cichocki@mudita.com>
Date: Wed, 13 Apr 2022 21:36:31 +0200
Subject: [PATCH] [MOS-388] Bumped CI GCC version to 11

Bumped CI to gcc11, clang-format to 14
---
 Jenkinsfile                 |  2 +-
 config/bootstrap_config     | 14 +++++++-------
 docker/Dockerfile.runner.in | 13 ++++++++-----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d235e00dc0..406c3dcdf0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
     }
     environment {
         JOBS=30
-        PATH="/usr/local/cmake-3.21.3-linux-x86_64/bin:/usr/local/gcc-arm-none-eabi-10-2020-q4-major/bin:$PATH"
+        PATH="/usr/local/cmake-3.21.3-linux-x86_64/bin:/usr/local/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi/bin:$PATH"
         REPO_WORKSPACE="/home/jenkins/workspace/MuditaOS"
 
     }
diff --git a/config/bootstrap_config b/config/bootstrap_config
index 4b63383653..9261365310 100644
--- a/config/bootstrap_config
+++ b/config/bootstrap_config
@@ -1,9 +1,9 @@
 
 # configuration variables used by bootstrap and dockerbuilder
 # ARM_GCC="gcc-arm-none-eabi-9-2020-q2-update"
-ARM_GCC="gcc-arm-none-eabi-10-2020-q4-major"
-ARM_GCC_PKG="${ARM_GCC}-x86_64-linux.tar.bz2"
-ARM_GCC_SOURCE_LINK="https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2?revision=ca0cbf9c-9de2-491c-ac48-898b5bbc0443&la=en&hash=68760A8AE66026BCF99F05AC017A6A50C6FD832A"
+ARM_GCC="gcc-arm-11.2-2022.02-x86_64-arm-none-eabi"
+ARM_GCC_PKG="${ARM_GCC}.tar.xz"
+ARM_GCC_SOURCE_LINK="https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz"
 ARM_GCC_PATH_VAR="${ARM_GCC//-/_}"
 ARM_GCC_MD5="8312c4c91799885f222f663fc81f9a31"
 
@@ -22,12 +22,12 @@ INSTALL_PACKAGES="
         build-essential \
         ca-certificates \
         ccache \
-        clang-format-12 \
-        clang-tidy-12 \
+        clang-format-14 \
+        clang-tidy-14 \
         curl \
         doxygen \
-        g++-10 \
-        gcc-10 \
+        g++-11 \
+        gcc-11 \
         gdb \
         git \
         gnupg2 \
diff --git a/docker/Dockerfile.runner.in b/docker/Dockerfile.runner.in
index c5a8c6e4b8..cf3be33d4c 100644
--- a/docker/Dockerfile.runner.in
+++ b/docker/Dockerfile.runner.in
@@ -1,13 +1,17 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 MAINTAINER ops@mudita.com
 # Docker runner for MuditaOS builds
 
 RUN ln -fs /usr/share/zoneinfo/@DOCKER_TIMEZONE@ /etc/localtime
-RUN export DEBIAN_FRONTEND=noninteractive 
+RUN export DEBIAN_FRONTEND=noninteractive
+#RUN echo "deb mirror://mirrors.ubuntu.com/mirrors.txt focal main restricted" | tee -a /etc/apt/sources.list
 RUN apt-get update
+RUN apt-get full-upgrade -y
 
-RUN apt-get full-upgrade -y 
+RUN apt-get install software-properties-common -y
+#RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
+#RUN apt-get update
 RUN apt-get install -y \
         @INSTALL_PACKAGES@
 RUN apt-get -qy autoremove
@@ -20,9 +24,8 @@ RUN locale-gen pl_PL.UTF-8 \
     dpkg-reconfigure --frontend noninteractive tzdata
 RUN mkdir -p /home/runner/app/settings
 
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 1000 --slave /usr/bin/g++ g++ /usr/bin/g++-10
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 1000 --slave /usr/bin/g++ g++ /usr/bin/g++-11
 
-RUN apt-get install software-properties-common -y
 RUN add-apt-repository ppa:git-core/ppa -y
 RUN apt-get update
 RUN apt-get install git -y