Skip to content

Commit 0ec0c5a

Browse files
committed
Add gcc 15 to CI
1 parent 7709b64 commit 0ec0c5a

1 file changed

Lines changed: 5 additions & 13 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -490,15 +490,6 @@ jobs:
490490
sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
491491
sudo apt-get install g++-14
492492
493-
- name: Install g++ 15
494-
id: install_gcc_15
495-
if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'g++-15' ) && ( !matrix.config.container )
496-
shell: bash
497-
working-directory: ${{ env.HOME }}
498-
run: |
499-
sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
500-
sudo apt-get install g++-15
501-
502493
- name: Install GCC 15 and tools (Debian container)
503494
if: matrix.config.container == 'debian:testing' && matrix.config.cxx == 'g++-15'
504495
shell: bash
@@ -536,14 +527,15 @@ jobs:
536527
- name: Create Build Environment
537528
# Some projects don't allow in-source building, so create a separate build directory
538529
# We'll use this as our working directory for all subsequent commands
539-
run: cmake -E make_directory ${{runner.workspace}}/build
530+
# Use github.workspace since only this path is mounted inside containers
531+
run: cmake -E make_directory ${{ github.workspace }}/build
540532

541533
- name: Configure CMake
542534
if: (!contains(matrix.config.mingw, 'MINGW'))
543535
# Use a bash shell so we can use the same syntax for environment variable
544536
# access regardless of the host operating system
545537
shell: bash
546-
working-directory: ${{runner.workspace}}/build
538+
working-directory: ${{ github.workspace }}/build
547539
env:
548540
CXX: ${{ matrix.config.cxx }}
549541
# Note the current convention is to use the -S and -B options here to specify source
@@ -563,14 +555,14 @@ jobs:
563555
564556
- name: Build
565557
if: (!contains(matrix.config.mingw, 'MINGW'))
566-
working-directory: ${{runner.workspace}}/build
558+
working-directory: ${{ github.workspace }}/build
567559
shell: bash
568560
# Execute the build. You can specify a specific target with "--target <NAME>"
569561
run: cmake --build . --config ${{ matrix.config.buildtype }}
570562

571563
- name: Test
572564
if: (!contains(matrix.config.mingw, 'MINGW'))
573-
working-directory: ${{runner.workspace}}/build
565+
working-directory: ${{ github.workspace }}/build
574566
shell: bash
575567
# Execute tests defined by the CMake configuration.
576568
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail

0 commit comments

Comments
 (0)