Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MOS-388] Bumped CI GCC version to 11 #3740

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[MOS-388] Bumped CI GCC version to 11 #3740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

}
Expand Down
14 changes: 7 additions & 7 deletions config/bootstrap_config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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 \
Expand Down
13 changes: 8 additions & 5 deletions docker/Dockerfile.runner.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
FROM ubuntu:focal
FROM ubuntu:jammy

MAINTAINER [email protected]
# 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
Expand All @@ -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
Expand Down