Skip to content

Commit dad87ba

Browse files
authored
Merge branch 'main' into fix/doc_comment_api
2 parents 6a91bc4 + 7801cd9 commit dad87ba

Some content is hidden

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

43 files changed

+1954
-64
lines changed

.devcontainer/Dockerfile.conan

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
3-
FROM ubuntu:24.04
3+
FROM ubuntu:24.04@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02
44

55
RUN apt update && apt install -y \
66
build-essential \
@@ -19,7 +19,7 @@ RUN apt update && apt install -y \
1919
libtool \
2020
python3-pip
2121

22-
RUN pip install conan --break-system-packages
22+
RUN pip install "conan==2.15.1" --break-system-packages
2323

2424
ARG USER_UID=1000
2525
ARG USER_GID=1000
@@ -52,4 +52,4 @@ WORKDIR /workspaces/opentelemetry-cpp
5252

5353
ENTRYPOINT []
5454

55-
CMD ["/bin/bash"]
55+
CMD ["/bin/bash"]

.devcontainer/Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ENV IS_CONTAINER_BUILD=true
4747

4848
COPY ./.devcontainer/customize_container.sh /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
4949
RUN /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
50-
RUN apt install -y npm && npm install -g markdownlint-cli
50+
RUN apt install -y npm && npm install -g markdownlint-cli@0.44.0
5151

5252
USER devuser
5353

.github/workflows/benchmark.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ jobs:
1313
name: Run OpenTelemetry-cpp benchmarks
1414
runs-on: ubuntu-latest
1515
steps:
16+
- name: Harden the runner (Audit all outbound calls)
17+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
18+
with:
19+
egress-policy: audit
20+
1621
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1722
with:
1823
submodules: 'recursive'
@@ -47,8 +52,13 @@ jobs:
4752
name: Store benchmark result
4853
runs-on: ubuntu-latest
4954
steps:
55+
- name: Harden the runner (Audit all outbound calls)
56+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
57+
with:
58+
egress-policy: audit
59+
5060
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
51-
- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # main March 2025
61+
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # main March 2025
5262
with:
5363
name: benchmark_results
5464
path: benchmarks

0 commit comments

Comments
 (0)