Skip to content

Commit 2ec69ee

Browse files
committed
Fix format
1 parent 295941f commit 2ec69ee

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

.github/workflows/analyzer.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
# Initializes the CodeQL tools for scanning.
3030
- name: Initialize CodeQL
31-
uses: github/codeql-action/init@v3
31+
uses: github/codeql-action/init@v4
3232
with:
3333
languages: ${{ matrix.language }}
3434
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -43,7 +43,7 @@ jobs:
4343
run: make -j build
4444

4545
- name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@v3
46+
uses: github/codeql-action/analyze@v4
4747
with:
4848
category: "/language:${{matrix.language}}"
4949

@@ -64,20 +64,20 @@ jobs:
6464
uses: actions/checkout@v4
6565
with:
6666
repository: include-what-you-use/include-what-you-use
67-
ref: 6e08906c66b3009f2d590e4bd40d60fa303bf803
67+
ref: 0.25
6868
path: include-what-you-use
6969

7070
- name: Download required linux packages
7171
run: |
72-
sudo add-apt-repository 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main'
72+
sudo add-apt-repository 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-21 main'
7373
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
7474
sudo apt update
75-
sudo apt install -y libclang-20-dev clang-20 libc++-20-dev
75+
sudo apt install -y libclang-21-dev clang-21 libc++-21-dev
7676
7777
- name: Set up include-what-you-use
7878
run: |
7979
mkdir build && cd build
80-
cmake -G "Unix Makefiles" -DCMAKE_PREFIX_PATH="/usr/lib/llvm-20" ..
80+
cmake -G "Unix Makefiles" -DCMAKE_PREFIX_PATH="/usr/lib/llvm-21" ..
8181
sudo make install
8282
working-directory: include-what-you-use
8383

@@ -99,7 +99,7 @@ jobs:
9999
uses: actions/checkout@v4
100100

101101
- name: Run clang-format style check
102-
uses: jidicula/clang-format-action@v4.15.0
102+
uses: jidicula/clang-format-action@v4.16.0
103103
id: clang-format
104104
with:
105-
clang-format-version: '20'
105+
clang-format-version: '21'

.github/workflows/libcxx17.imp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
{ include: [ "<iosfwd>", public, "<iostream>", public ] },
2222

2323
# Missing mappings in include-what-you-use's libcxx.imp
24+
{ include: ["@<__cstddef/.*>", private, "<cstddef>", public ] },
2425
{ include: ["@<__condition_variable/.*>", private, "<condition_variable>", public ] },
2526
{ include: ["@<__mutex/.*>", private, "<mutex>", public ] },
27+
{ include: ["@<__type_traits/.*>", private, "<type_traits>", public ] },
28+
{ include: ["@<__utility/.*>", private, "<utility>", public ] },
2629
]

scripts/get_native_properties.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ set_arch_x86_64() {
4444
elif check_flags 'avx512vnni' 'avx512dq' 'avx512f' 'avx512bw' 'avx512vl'; then
4545
true_arch='x86-64-vnni512'
4646
elif check_flags 'avx512f' 'avx512bw'; then
47-
true_arch='x86-64-avx512bw'
48-
elif check_flags 'avx512f'; then
4947
true_arch='x86-64-avx512'
5048
elif check_flags 'avxvnni'; then
5149
true_arch='x86-64-avxvnni'
@@ -82,12 +80,12 @@ case $uname_s in
8280
case $uname_m in
8381
'arm64')
8482
true_arch='apple-silicon'
85-
file_arch='x86-64-sse41-popcnt' # Supported by Rosetta 2
83+
file_arch='m1-apple-silicon'
8684
;;
8785
'x86_64')
8886
flags=$(sysctl -n machdep.cpu.features machdep.cpu.leaf7_features | tr '\n' ' ' | tr '[:upper:]' '[:lower:]' | tr -d '_.')
8987
set_arch_x86_64
90-
if [ "$true_arch" = 'x86-64-vnni256' ] || [ "$true_arch" = 'x86-64-avx512' ]; then
88+
if [ "$true_arch" = 'x86-64-avx512' ]; then
9189
file_arch='x86-64-bmi2'
9290
fi
9391
;;
@@ -162,4 +160,4 @@ fi
162160

163161
file_name="stockfish-$file_os-$file_arch.$file_ext"
164162

165-
printf '%s %s\n' "$true_arch" "$file_name"
163+
printf '%s %s\n' "$true_arch" "$file_name"

src/ucioption.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ class Option {
4747
Option(const char* v, const char* cur, OnChange = nullptr);
4848

4949
Option& operator=(const std::string&);
50-
operator int() const;
51-
operator std::string() const;
52-
bool operator==(const char*) const;
53-
bool operator!=(const char*) const;
50+
operator int() const;
51+
operator std::string() const;
52+
bool operator==(const char*) const;
53+
bool operator!=(const char*) const;
5454

5555
friend std::ostream& operator<<(std::ostream&, const OptionsMap&);
5656

0 commit comments

Comments
 (0)