Skip to content

Commit acd41a9

Browse files
authored
Update tool chain (#25)
1 parent 600bbd2 commit acd41a9

File tree

5 files changed

+31
-21
lines changed

5 files changed

+31
-21
lines changed

.github/workflows/bvt-appleclang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33

44
jobs:
55
bvt-appleclang:
6-
runs-on: macos-15
6+
runs-on: macos-26
77
steps:
88
- uses: actions/checkout@v4
99

.github/workflows/bvt-clang.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
on:
22
workflow_call:
33

4+
env:
5+
CLANG_VERSION: 22
6+
47
jobs:
58
bvt-clang:
69
runs-on: ubuntu-24.04
@@ -12,30 +15,30 @@ jobs:
1215

1316
- name: install clang
1417
run: |
15-
curl https://apt.llvm.org/llvm.sh | sudo bash -s -- 21
16-
sudo apt install -y clang-21 libc++-21-dev clang-format-21
17-
cat <<'EOF' >> "$GITHUB_ENV"
18-
CC=clang-21
19-
CXX=clang++-21
20-
CXXFLAGS=-stdlib=libc++
21-
EOF
18+
curl https://apt.llvm.org/llvm.sh | sudo bash -s -- "$CLANG_VERSION"
19+
sudo apt install -y "clang-$CLANG_VERSION" "libc++-$CLANG_VERSION-dev" "clang-format-$CLANG_VERSION"
20+
{
21+
echo "CC=clang-$CLANG_VERSION"
22+
echo "CXX=clang++-$CLANG_VERSION"
23+
echo "CXXFLAGS=-stdlib=libc++"
24+
} >> "$GITHUB_ENV"
2225
2326
- name: check compiler version
2427
run: |
2528
"$CXX" --version
2629
27-
- name: build and run test with clang 21 on cmake
30+
- name: build and run test with clang ${{ env.CLANG_VERSION }} on cmake
2831
run: |
2932
cmake -B build-cmake -GNinja -DCMAKE_CXX_STANDARD=23 -DCMAKE_BUILD_TYPE=Release -DPROXY_BUILD_MODULES=TRUE
3033
mapfile -t FILES < <(find include tests benchmarks build-cmake/examples_from_docs tools -type f \( -name '*.h' -o -name '*.ixx' -o -name '*.cpp' \))
3134
echo "Running clang-format on ${#FILES[@]} files: ${FILES[*]}"
32-
clang-format-21 --dry-run --Werror "${FILES[@]}"
35+
"clang-format-$CLANG_VERSION" --dry-run --Werror "${FILES[@]}"
3336
cmake --build build-cmake -j
3437
ctest --test-dir build-cmake -j
3538
mkdir build-cmake/drop
3639
bash ./tools/dump_build_env.sh "$CXX" build-cmake/drop/env-info.json
3740
38-
- name: build and run test with clang 21 on meson
41+
- name: build and run test with clang ${{ env.CLANG_VERSION }} on meson
3942
run: |
4043
meson setup build-meson --buildtype=release -Dtests=enabled -Dbenchmarks=enabled --force-fallback-for=fmt
4144
meson test -C build-meson

.github/workflows/bvt-compatibility.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
- {family: clang, version: 18, modules: false}
1616
- {family: clang, version: 19, modules: false}
1717
- {family: clang, version: 20, modules: true}
18+
- {family: clang, version: 21, modules: true}
1819

1920
steps:
2021
- uses: actions/checkout@v4
@@ -31,6 +32,9 @@ jobs:
3132
- name: install clang
3233
if: ${{ matrix.compiler.family == 'clang' }}
3334
run: |
35+
if [ '${{ matrix.compiler.version }}' -ge 21 ]; then
36+
curl https://apt.llvm.org/llvm.sh | sudo bash -s -- '${{ matrix.compiler.version }}'
37+
fi
3438
sudo apt install -y 'clang-${{ matrix.compiler.version }}' 'clang-tools-${{ matrix.compiler.version }}' 'libc++-${{ matrix.compiler.version }}-dev' 'libc++abi-${{ matrix.compiler.version }}-dev'
3539
cat <<'EOF' >> "$GITHUB_ENV"
3640
CC=clang-${{ matrix.compiler.version }}

.github/workflows/bvt-nvhpc.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
on:
22
workflow_call:
33

4+
env:
5+
NVHPC_VERSION: 26.3
6+
47
jobs:
58
bvt-nvhpc:
69
runs-on: ubuntu-24.04
@@ -14,18 +17,18 @@ jobs:
1417
# # FIXME: install from upstream once https://github.com/mesonbuild/meson/pull/15353 is released
1518
# run: pipx install git+https://github.com/mesonbuild/meson@02b85a846629090a0c7f18e860bab0a10ea4349b
1619

17-
- name: install NVHPC 25.11
20+
- name: install NVHPC ${{ env.NVHPC_VERSION }}
1821
run: |
1922
curl https://developer.download.nvidia.com/hpc-sdk/ubuntu/DEB-GPG-KEY-NVIDIA-HPC-SDK | sudo gpg --dearmor -o /usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg
2023
echo 'deb [signed-by=/usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | sudo tee /etc/apt/sources.list.d/nvhpc.list
2124
sudo apt-get update -y
22-
sudo apt-get install -y nvhpc-25-11
23-
cat<<'EOF' >> "$GITHUB_ENV"
24-
CC=/opt/nvidia/hpc_sdk/Linux_x86_64/25.11/compilers/bin/nvc
25-
CXX=/opt/nvidia/hpc_sdk/Linux_x86_64/25.11/compilers/bin/nvc++
26-
EOF
25+
sudo apt-get install -y "nvhpc-${NVHPC_VERSION/./-}"
26+
{
27+
echo "CC=/opt/nvidia/hpc_sdk/Linux_x86_64/$NVHPC_VERSION/compilers/bin/nvc"
28+
echo "CXX=/opt/nvidia/hpc_sdk/Linux_x86_64/$NVHPC_VERSION/compilers/bin/nvc++"
29+
} >> "$GITHUB_ENV"
2730
28-
- name: build and run test with NVHPC 25.11 on cmake
31+
- name: build and run test with NVHPC ${{ env.NVHPC_VERSION }} on cmake
2932
run: |
3033
cmake -B build-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPROXY_BUILD_MODULES=FALSE
3134
cmake --build build-cmake -j
@@ -34,7 +37,7 @@ jobs:
3437
chmod +x tools/dump_build_env.sh
3538
./tools/dump_build_env.sh "$CXX" build-cmake/drop/env-info.json
3639
37-
# - name: build and run test with NVHPC 25.11 on meson
40+
# - name: build and run test with NVHPC ${{ env.NVHPC_VERSION }} on meson
3841
# run: |
3942
# meson setup build-meson --buildtype=release -Dtests=enabled -Dbenchmarks=enabled --force-fallback-for=fmt
4043
# meson test -C build-meson

benchmarks/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ project(msft_proxy_benchmarks)
22

33
FetchContent_Declare(
44
benchmark
5-
URL https://github.com/google/benchmark/archive/refs/tags/v1.9.4.tar.gz
6-
URL_HASH SHA256=b334658edd35efcf06a99d9be21e4e93e092bd5f95074c1673d5c8705d95c104
5+
URL https://github.com/google/benchmark/archive/refs/tags/v1.9.5.tar.gz
6+
URL_HASH SHA256=9631341c82bac4a288bef951f8b26b41f69021794184ece969f8473977eaa340
77
)
88
set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable tests for google benchmark")
99
set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE BOOL "Disable google benchmark unit tests")

0 commit comments

Comments
 (0)