Skip to content

Commit f4259a9

Browse files
GitHub Actions: update to Ubuntu-24.04
1 parent daf47ab commit f4259a9

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

.github/workflows/build-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
build:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-24.04
88

99
strategy:
1010
matrix:

.github/workflows/build-emscripten.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
strategy:
88
matrix:
9-
os: ["windows-latest", "ubuntu-20.04", "macos-14"]
9+
os: ["windows-latest", "ubuntu-24.04", "macos-14"]
1010
build_type: ["Debug", "Release"]
1111
exclude:
1212
# Exclude MacOS-Release
@@ -25,7 +25,7 @@ jobs:
2525
host_name: "Win10"
2626
cmake_args: "-DDILIGENT_EMSCRIPTEN_STRIP_DEBUG_INFO=ON"
2727

28-
- os: "ubuntu-20.04"
28+
- os: "ubuntu-24.04"
2929
host_name: "Linux"
3030
cmake_args: "-DDILIGENT_EMSCRIPTEN_STRIP_DEBUG_INFO=ON"
3131

.github/workflows/build-linux.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [push, pull_request]
55
jobs:
66
precheks:
77
name: Linux -> Pre-checks
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-24.04
99

1010
steps:
1111
- name: Clone DiligentCore
@@ -35,7 +35,7 @@ jobs:
3535

3636
build:
3737
needs: precheks
38-
runs-on: ubuntu-20.04
38+
runs-on: ubuntu-24.04
3939

4040
strategy:
4141
fail-fast: false
@@ -47,13 +47,13 @@ jobs:
4747
include:
4848
- name: "GCC"
4949
cmake_generator: "Unix Makefiles"
50-
cc: "gcc-9"
51-
cxx: "g++-9"
50+
cc: "gcc-14"
51+
cxx: "g++-14"
5252

5353
- name: "Clang"
5454
cmake_generator: "Ninja"
55-
cc: "clang-12"
56-
cxx: "clang++-12"
55+
cc: "clang-18"
56+
cxx: "clang++-18"
5757

5858
name: Linux -> ${{ matrix.name }}-x64, ${{ matrix.build_type }}
5959

Tutorials/Tutorial00_HelloLinux/src/Tutorial00_HelloLinux.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,8 @@ int x_main()
512512
GLX_DEPTH_SIZE, 24,
513513

514514
//GLX_SAMPLE_BUFFERS, 1,
515-
GLX_SAMPLES, 1,
515+
//GLX_SAMPLES, 1, // 0 Means no MSAA. 1 Requests any MSAA.
516+
// If MSAA is not supported, glXChooseFBConfig will fail.
516517
None
517518
};
518519
// clang-format on

0 commit comments

Comments
 (0)