Skip to content

Commit e341218

Browse files
authored
Switch to gcc-15 in Ubuntu 26.04 Docker image (#793)
1 parent bbc9dfd commit e341218

8 files changed

Lines changed: 17 additions & 19 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
}
1414
},
15-
"image": "ghcr.io/learning-process/ppc-ubuntu:1.2",
15+
"image": "ghcr.io/learning-process/ppc-ubuntu:1.3",
1616
"name": "Parallel Programming Course",
1717
"postCreateCommand": "python3 -m pip install -r requirements.txt"
1818
}

.github/workflows/static-analysis-pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ jobs:
123123
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
124124
-D PPC_TASKS="${{ needs.ci-scope.outputs.ppc_tasks || 'all' }}"
125125
env:
126-
CC: gcc-14
127-
CXX: g++-14
126+
CC: gcc-15
127+
CXX: g++-15
128128

129129
- name: Build project
130130
run: |
131131
cmake --build build --parallel -- --quiet
132132
env:
133-
CC: gcc-14
134-
CXX: g++-14
133+
CC: gcc-15
134+
CXX: g++-15
135135

136136
- name: Show ccache stats
137137
run: ccache --show-stats

.github/workflows/ubuntu.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
-D CMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=install
4747
-D PPC_TASKS="${{ inputs.ppc_tasks }}"
4848
env:
49-
CC: gcc-14
50-
CXX: g++-14
49+
CC: gcc-15
50+
CXX: g++-15
5151
- name: Archive revert list
5252
uses: actions/upload-artifact@v7
5353
if: ${{ matrix.os == 'ubuntu-24.04' && matrix.build_type == 'Release' }}
@@ -58,8 +58,8 @@ jobs:
5858
run: |
5959
cmake --build build --parallel -- --quiet
6060
env:
61-
CC: gcc-14
62-
CXX: g++-14
61+
CC: gcc-15
62+
CXX: g++-15
6363
- name: Install project
6464
run: |
6565
cmake --build build --target install -- --quiet
@@ -398,7 +398,7 @@ jobs:
398398
run: |
399399
mkdir cov-report
400400
cd build
401-
gcovr --gcov-executable `which gcov-14` \
401+
gcovr --gcov-executable `which gcov-15` \
402402
-r ../ \
403403
--exclude '.*3rdparty/.*' \
404404
--exclude '/usr/.*' \

docker/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
### [1.3] - 2026-06-01
66

7-
- Update base image to Ubuntu 26.04
7+
- Update base image to Ubuntu 26.04 and switch to gcc-15
88

99
### [1.2] - 2026-02-25
1010

docker/ubuntu.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN set -e \
1515
libmpich-dev mpich \
1616
openmpi-bin openmpi-common libopenmpi-dev \
1717
libomp-dev \
18-
gcc-14 g++-14 \
18+
gcc-15 g++-15 \
1919
gcovr zip \
2020
&& wget -q https://apt.llvm.org/llvm.sh \
2121
&& chmod +x llvm.sh \
@@ -24,6 +24,6 @@ RUN set -e \
2424
&& apt-get clean \
2525
&& rm -rf /var/lib/apt/lists/*
2626

27-
ENV CC=gcc-14 CXX=g++-14
27+
ENV CC=gcc-15 CXX=g++-15
2828

2929
CMD ["bash"]

docs/locale/en/LC_MESSAGES/user_guide/environment.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ msgid "The container includes:"
8080
msgstr ""
8181

8282
#: ../../../../docs/user_guide/environment.rst:21
83-
msgid "Ubuntu environment with gcc-14, CMake, MPI, OpenMP"
83+
msgid "Ubuntu environment with gcc-15, CMake, MPI, OpenMP"
8484
msgstr ""
8585

8686
#: ../../../../docs/user_guide/environment.rst:22

docs/locale/ru/LC_MESSAGES/user_guide/environment.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ msgid "The container includes:"
8989
msgstr "Контейнер включает:"
9090

9191
#: ../../../../docs/user_guide/environment.rst:21
92-
msgid "Ubuntu environment with gcc-14, CMake, MPI, OpenMP"
93-
msgstr "Окружение Ubuntu с gcc-14, CMake, MPI, OpenMP"
92+
msgid "Ubuntu environment with gcc-15, CMake, MPI, OpenMP"
93+
msgstr "Окружение Ubuntu с gcc-15, CMake, MPI, OpenMP"
9494

9595
#: ../../../../docs/user_guide/environment.rst:22
9696
msgid "Pre-configured C++ and Python development tools"

docs/user_guide/environment.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The easiest way to set up your development environment is using the provided ``.
1818
3. VS Code will automatically build the container with all dependencies pre-installed
1919
4. The container includes:
2020

21-
- Ubuntu environment with gcc-14, CMake, MPI, OpenMP
21+
- Ubuntu environment with gcc-15, CMake, MPI, OpenMP
2222
- Pre-configured C++ and Python development tools
2323
- All project dependencies ready to use
2424

@@ -69,8 +69,6 @@ Install these to match the CI toolchain for static analysis and coverage reports
6969
sudo apt update && sudo apt install -y clang-tidy-22
7070
# gcovr via pip (or use your distro package)
7171
python3 -m pip install gcovr
72-
# GCC 14 coverage helper (used in CI)
73-
which gcov-14 || echo "Install GCC 14 to use gcov-14"
7472
7573
- macOS (Homebrew):
7674

0 commit comments

Comments
 (0)