Skip to content

Commit baa843b

Browse files
GitHub Actions: update to Ubuntu-24.04
1 parent fb05e58 commit baa843b

File tree

4 files changed

+19
-22
lines changed

4 files changed

+19
-22
lines changed

.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

1212
exclude:
@@ -19,7 +19,7 @@ jobs:
1919
host_name: "Win10"
2020
cmake_args: "-DDILIGENT_BUILD_CORE_TESTS=ON -DDILIGENT_EMSCRIPTEN_STRIP_DEBUG_INFO=ON"
2121

22-
- os: "ubuntu-20.04"
22+
- os: "ubuntu-24.04"
2323
host_name: "Linux"
2424
cmake_args: "-DDILIGENT_BUILD_CORE_TESTS=ON -DDILIGENT_EMSCRIPTEN_STRIP_DEBUG_INFO=ON"
2525

.github/workflows/build-linux.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
jobs:
66
precheks:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-24.04
88
name: Linux -> Pre-checks
99

1010
steps:
@@ -27,7 +27,7 @@ jobs:
2727

2828
build:
2929
needs: precheks
30-
runs-on: ubuntu-20.04
30+
runs-on: ubuntu-24.04
3131

3232
strategy:
3333
fail-fast: false
@@ -37,43 +37,43 @@ jobs:
3737
build_type: "Debug"
3838
cmake_generator: "Unix Makefiles"
3939
cmake_args: "-DDILIGENT_BUILD_TESTS=ON"
40-
cc: "gcc-9"
41-
cxx: "g++-9"
40+
cc: "gcc-14"
41+
cxx: "g++-14"
4242

4343
- name: "GCC"
4444
build_type: "Release"
4545
cmake_generator: "Unix Makefiles"
4646
cmake_args: "-DDILIGENT_BUILD_TESTS=ON"
47-
cc: "gcc-9"
48-
cxx: "g++-9"
47+
cc: "gcc-14"
48+
cxx: "g++-14"
4949

5050
- name: "Clang"
5151
build_type: "Debug"
5252
cmake_generator: "Ninja"
5353
cmake_args: "-DDILIGENT_BUILD_TESTS=ON"
54-
cc: "clang-12"
55-
cxx: "clang++-12"
54+
cc: "clang-18"
55+
cxx: "clang++-18"
5656

5757
- name: "Clang"
5858
build_type: "Release"
5959
cmake_generator: "Ninja"
6060
cmake_args: "-DDILIGENT_BUILD_TESTS=ON"
61-
cc: "clang-12"
62-
cxx: "clang++-12"
61+
cc: "clang-18"
62+
cxx: "clang++-18"
6363

6464
- name: "Clang-NO_GLSLANG"
6565
build_type: "Debug"
6666
cmake_generator: "Ninja"
6767
cmake_args: "-DDILIGENT_BUILD_CORE_TESTS=ON -DDILIGENT_NO_OPENGL=ON -DDILIGENT_NO_GLSLANG=ON"
68-
cc: "clang-12"
69-
cxx: "clang++-12"
68+
cc: "clang-18"
69+
cxx: "clang++-18"
7070

7171
- name: "Clang-NO_GLSLANG-NO_HLSL"
7272
build_type: "Release"
7373
cmake_generator: "Ninja"
7474
cmake_args: "-DDILIGENT_BUILD_CORE_TESTS=ON -DDILIGENT_NO_GLSLANG=ON -DDILIGENT_NO_HLSL=ON"
75-
cc: "clang-12"
76-
cxx: "clang++-12"
75+
cc: "clang-18"
76+
cxx: "clang++-18"
7777

7878
name: Linux -> ${{ matrix.name }}-x64, ${{ matrix.build_type }}
7979

@@ -119,22 +119,19 @@ jobs:
119119
uses: DiligentGraphics/github-action/run-core-gpu-tests@v1
120120
with:
121121
mode: vk_sw
122-
args: --gtest_filter=-DrawCommandTest.DrawIndexedInstancedIndirect_FirstInstance_BaseVertex_FirstIndex_VBOffset_IBOffset_InstOffset:TextureCreation/TextureCreationTest.CreateTexture/TEX_FORMAT_BGRA8_TYPELESS
123122

124123
- name: DiligentCoreAPITest GL
125124
if: ${{ (success() || failure() && steps.build.outcome == 'success') && (matrix.name == 'Clang' || matrix.name == 'GCC') }}
126125
uses: DiligentGraphics/github-action/run-core-gpu-tests@v1
127126
with:
128127
mode: gl
129-
args: "--gtest_filter=-DrawCommandTest.MultiDrawIndirectCount:DrawCommandTest.MultiDrawIndexedIndirectCount:PipelineResourceSignatureTest.StructuredBuffers"
130128

131129
- name: DiligentCoreAPITest GL with Non-Separable Programs
132130
if: ${{ (success() || failure() && steps.build.outcome == 'success') && (matrix.name == 'Clang' || matrix.name == 'GCC') }}
133131
uses: DiligentGraphics/github-action/run-core-gpu-tests@v1
134132
with:
135133
mode: gl
136134
non-separable-progs: true
137-
args: "--gtest_filter=-DrawCommandTest.MultiDrawIndirectCount:DrawCommandTest.MultiDrawIndexedIndirectCount:PipelineResourceSignatureTest.StructuredBuffers:DrawCommandTest.StructuredBufferArray"
138135

139136
- name: Upload artifact
140137
uses: actions/upload-artifact@v4

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818

1919
- host_name: "Linux"
2020
platform: "Linux"
21-
os: "ubuntu-20.04"
21+
os: "ubuntu-24.04"
2222
cmake_generator: "Ninja"
23-
cc: "clang-12"
24-
cxx: "clang++-12"
23+
cc: "clang-18"
24+
cxx: "clang++-18"
2525

2626
runs-on: ${{ matrix.os }}
2727
name: ${{ matrix.host_name }} -> Code QL, ${{ matrix.toolset }}, ${{ matrix.build_type }}
378 KB
Binary file not shown.

0 commit comments

Comments
 (0)