Skip to content

Commit 00abe38

Browse files
authored
Merge branch 'main' into async-example
2 parents aa88317 + 767f797 commit 00abe38

55 files changed

Lines changed: 1757 additions & 224 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/Dockerfile.dev

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,24 @@ ENV THIRD_PARTY_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
1515

1616
COPY ci /opt/ci
1717

18-
RUN apt update && apt install -y wget \
18+
RUN apt update && apt install -y wget gnupg lsb-release software-properties-common && \
19+
wget -qO- https://apt.llvm.org/llvm.sh | bash -s -- 22 && \
20+
apt install -y \
1921
ninja-build \
20-
llvm-20-dev \
21-
libclang-20-dev \
22-
clang-tidy-20 \
22+
llvm-22-dev \
23+
libclang-22-dev \
24+
clang-22 \
25+
clang-tidy-22 \
2326
shellcheck \
2427
sudo \
2528
cmake
2629

27-
RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-20 200 && \
28-
update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-20 200 && \
30+
RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-22 200 && \
31+
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-22 200 && \
32+
update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-22 200 && \
33+
update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-22 200 && \
34+
update-alternatives --config clang && \
35+
update-alternatives --config clang++ && \
2936
update-alternatives --config clang-tidy && \
3037
update-alternatives --config llvm-config
3138

.github/workflows/benchmark.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Harden the runner (Audit all outbound calls)
16-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
16+
uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
1717
with:
1818
egress-policy: audit
1919

@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
steps:
5757
- name: Harden the runner (Audit all outbound calls)
58-
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
58+
uses: step-security/harden-runner@a5ad31d6a139d249332a2605b85202e8c0b78450 # v2.19.1
5959
with:
6060
egress-policy: audit
6161

@@ -69,7 +69,7 @@ jobs:
6969
run: |
7070
cat benchmarks/*
7171
- name: Push benchmark result
72-
uses: benchmark-action/github-action-benchmark@a60cea5bc7b49e15c1f58f411161f99e0df48372 # v1.22.0
72+
uses: benchmark-action/github-action-benchmark@52576c92bccf6ac60c8223ec7eb2565637cae9ba # v1.22.1
7373
with:
7474
name: OpenTelemetry-cpp ${{ matrix.components }} Benchmark
7575
tool: 'googlecpp'

0 commit comments

Comments
 (0)