Skip to content

Commit 198173a

Browse files
committed
ci: upgrade ubuntu for gcc-14
1 parent 86ebd5c commit 198173a

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

.github/workflows/cmake-tag.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
strategy:
1616
fail-fast: true
1717
matrix:
18-
os: [ubuntu-22.04, windows-latest, macos-12]
18+
os: [ubuntu-24.04, windows-latest, macos-12]
1919
include:
20-
- os: ubuntu-22.04
21-
cmake: /usr/bin/env CC=gcc-13 CXX=g++-13 cmake
20+
- os: ubuntu-24.04
21+
cmake: /usr/bin/env CC=gcc-14 CXX=g++-14 cmake
2222
- os: macos-12
2323
cmake: /usr/bin/env CC="$(brew --prefix llvm@17)/bin/clang" CXX="$(brew --prefix llvm@17)/bin/clang++" cmake
2424
- os: windows-latest
@@ -32,16 +32,16 @@ jobs:
3232
- uses: abdes/gha-setup-ninja@master
3333
with:
3434
version: 1.11.1
35-
if: matrix.os != 'ubuntu-22.04'
35+
if: matrix.os != 'ubuntu-24.04'
3636

3737
- name: Install Linux dependencies
3838
run: |
3939
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
4040
sudo apt -q=2 update
41-
sudo apt install g++-13 gdb ninja-build libbenchmark-dev
41+
sudo apt install g++-14 gdb ninja-build libbenchmark-dev
4242
sudo apt -q install libgl1-mesa-dri libgl-dev libglx-dev xorg-dev xvfb libopencv-dev
4343
sudo apt -q install libsdl2-dev
44-
if: matrix.os == 'ubuntu-22.04'
44+
if: matrix.os == 'ubuntu-24.04'
4545

4646
- name: Install OSX dependencies
4747
run: |
@@ -61,7 +61,7 @@ jobs:
6161
set -e
6262
xvfb-run gdb -q -batch -x ../../.github/gdbscript.py --args bin/floormat-test
6363
xvfb-run gdb -q -batch -x ../../.github/gdbscript.py --args bin/floormat-benchmark
64-
if: matrix.os == 'ubuntu-22.04'
64+
if: matrix.os == 'ubuntu-24.04'
6565

6666
# - name: Upload build
6767
# uses: actions/[email protected]

.github/workflows/cmake.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
strategy:
1616
fail-fast: true
1717
matrix:
18-
#os: [ubuntu-22.04, windows-latest, macos-12]
19-
os: [ubuntu-22.04]
18+
#os: [ubuntu-24.04, windows-latest, macos-12]
19+
os: [ubuntu-24.04]
2020
include:
21-
- os: ubuntu-22.04
22-
cmake: /usr/bin/env CC=gcc-13 CXX=g++-13 cmake
21+
- os: ubuntu-24.04
22+
cmake: /usr/bin/env CC=gcc-14 CXX=g++-14 cmake
2323
#- os: macos-12
2424
# cmake: /usr/bin/env CC="$(brew --prefix llvm@16)/bin/clang" CXX="$(brew --prefix llvm@16)/bin/clang++" cmake
2525
#- os: windows-latest
@@ -33,16 +33,16 @@ jobs:
3333
- uses: abdes/gha-setup-ninja@master
3434
with:
3535
version: 1.11.1
36-
if: matrix.os != 'ubuntu-22.04'
36+
if: matrix.os != 'ubuntu-24.04'
3737

3838
- name: Install Linux dependencies
3939
run: |
4040
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
4141
sudo apt -q=2 update
42-
sudo apt install g++-13 gdb ninja-build libbenchmark-dev
42+
sudo apt install g++-14 gdb ninja-build libbenchmark-dev
4343
sudo apt -q install libgl1-mesa-dri libgl-dev libglx-dev xorg-dev xvfb libopencv-dev
4444
sudo apt -q install libsdl2-dev
45-
if: matrix.os == 'ubuntu-22.04'
45+
if: matrix.os == 'ubuntu-24.04'
4646

4747
- name: Install OSX dependencies
4848
run: |
@@ -62,7 +62,7 @@ jobs:
6262
set -e
6363
xvfb-run gdb -q -batch -x ../../.github/gdbscript.py --args bin/floormat-test
6464
xvfb-run gdb -q -batch -x ../../.github/gdbscript.py --args bin/floormat-benchmark
65-
if: matrix.os == 'ubuntu-22.04'
65+
if: matrix.os == 'ubuntu-24.04'
6666

6767
# - name: Upload build
6868
# uses: actions/[email protected]

0 commit comments

Comments
 (0)