Skip to content

Commit 861204a

Browse files
committed
Bump compiler version, fix conflicting artifact names.
1 parent f2a4672 commit 861204a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/c-cpp.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ jobs:
4343
cxxflags: '/std:c++20 /Zc:char8_t'
4444
- os: ubuntu-latest
4545
compiler: clang
46-
cc: 'clang-14'
47-
cxx: 'clang++-14'
46+
cc: 'clang-18'
47+
cxx: 'clang++-18'
4848
cxxflags: '-std=c++20'
4949
- os: ubuntu-latest
5050
compiler: gcc
51-
cc: 'gcc-12'
52-
cxx: 'g++-12'
51+
cc: 'gcc-14'
52+
cxx: 'g++-14'
5353
cxxflags: '-std=c++2a'
5454

5555
name: Build EASTL
@@ -72,7 +72,7 @@ jobs:
7272
- name: Upload binaries
7373
uses: actions/upload-artifact@v4
7474
with:
75-
name: Binaries-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.configuration }}
75+
name: Binaries-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.configuration }}-${{ matrix.std_iter_compatibility }}
7676
path: build/
7777

7878
test:
@@ -97,7 +97,7 @@ jobs:
9797
- name: Download a Build Artifact
9898
uses: actions/download-artifact@v4
9999
with:
100-
name: Binaries-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.configuration }}
100+
name: Binaries-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.configuration }}-${{ matrix.std_iter_compatibility }}
101101
path: Binaries/
102102
- if: matrix.os == 'ubuntu-latest'
103103
run: chmod 755 ./Binaries/test/EASTLTest
@@ -125,7 +125,7 @@ jobs:
125125
- name: Download a Build Artifact
126126
uses: actions/download-artifact@v4
127127
with:
128-
name: Binaries-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.configuration }}
128+
name: Binaries-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.configuration }}-${{ matrix.std_iter_compatibility }}
129129
path: Binaries/
130130
- if: matrix.os == 'ubuntu-latest'
131131
run: chmod 755 ./Binaries/benchmark/EASTLBenchmarks

0 commit comments

Comments
 (0)