Skip to content

Commit 72181c3

Browse files
authored
cleanup actions (#364)
1 parent 74180b5 commit 72181c3

6 files changed

Lines changed: 18 additions & 18 deletions

File tree

.github/config/macos-12-clang-14/conan/profiles/default

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
arch=x86_64
33
build_type=Release
44
compiler=apple-clang
5+
compiler.version=14
56
compiler.cppstd=17
67
compiler.libcxx=libc++
7-
compiler.version=14
88
os=Macos
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[settings]
22
arch=x86_64
33
build_type=Release
4-
compiler=gcc
4+
compiler=clang
5+
compiler.version=15
56
compiler.cppstd=17
67
compiler.libcxx=libstdc++11
7-
compiler.version=12
88
os=Linux
99

1010
[conf]
11-
tools.build:compiler_executables={'c': 'gcc-12', 'cpp': 'g++-12'}
11+
tools.build:compiler_executables={'c': 'clang-15', 'cpp': 'clang++-15'}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[settings]
22
arch=x86_64
33
build_type=Release
4-
compiler=clang
4+
compiler=gcc
5+
compiler.version=12
56
compiler.cppstd=17
67
compiler.libcxx=libstdc++11
7-
compiler.version=15
88
os=Linux
99

1010
[conf]
11-
tools.build:compiler_executables={'c': 'clang-15', 'cpp': 'clang++-15'}
11+
tools.build:compiler_executables={'c': 'gcc-12', 'cpp': 'g++-12'}

.github/config/windows-2022-msvc-1939/conan/profiles/default

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
arch=x86_64
33
build_type=Release
44
compiler=msvc
5+
compiler.version=193
56
compiler.cppstd=17
67
compiler.runtime=dynamic
7-
compiler.version=193
88
os=Windows

.github/workflows/build_test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
config:
25-
- { os: ubuntu-22.04, compiler: clang-15, cc: clang-15, cxx: clang++-15 }
26-
- { os: ubuntu-22.04, compiler: gcc-12, cc: gcc-12, cxx: g++-12 }
27-
- { os: macos-12, compiler: clang-14, cc: clang, cxx: clang++ }
25+
- { os: ubuntu-22.04, compiler: clang-15 }
26+
- { os: ubuntu-22.04, compiler: gcc-12 }
27+
- { os: macos-12, compiler: clang-14 }
2828
- { os: windows-2022, compiler: msvc-1939 }
2929
steps:
3030
- name: checkout
@@ -100,7 +100,7 @@ jobs:
100100
fail-fast: false
101101
matrix:
102102
config:
103-
- { os: ubuntu-22.04, compiler: clang-15, cc: clang-15, cxx: clang++-15 }
103+
- { os: ubuntu-22.04, compiler: clang-15 }
104104
steps:
105105
- name: checkout
106106
uses: actions/checkout@v4
@@ -157,8 +157,8 @@ jobs:
157157
fail-fast: false
158158
matrix:
159159
config:
160-
- { os: ubuntu-22.04, compiler: clang-15, cc: clang-15, cxx: clang++-15 }
161-
- { os: macos-12, compiler: clang-14, cc: clang, cxx: clang++ }
160+
- { os: ubuntu-22.04, compiler: clang-15 }
161+
- { os: macos-12, compiler: clang-14 }
162162
steps:
163163
- name: checkout
164164
uses: actions/checkout@v4
@@ -218,9 +218,9 @@ jobs:
218218
fail-fast: false
219219
matrix:
220220
config:
221-
- { os: ubuntu-22.04, compiler: clang-15, cc: clang-15, cxx: clang++-15 }
222-
- { os: ubuntu-22.04, compiler: gcc-12, cc: gcc-12, cxx: g++-12 }
223-
- { os: macos-12, compiler: clang-14, cc: clang, cxx: clang++ }
221+
- { os: ubuntu-22.04, compiler: clang-15 }
222+
- { os: ubuntu-22.04, compiler: gcc-12 }
223+
- { os: macos-12, compiler: clang-14 }
224224
- { os: windows-2022, compiler: msvc-1939 }
225225
steps:
226226
- name: checkout

.github/workflows/tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
config:
20-
- { os: ubuntu-22.04, compiler: clang-15, cc: clang-15, cxx: clang++-15 }
20+
- { os: ubuntu-22.04, compiler: clang-15 }
2121
steps:
2222
- name: checkout
2323
uses: actions/checkout@v4

0 commit comments

Comments
 (0)