Skip to content

Commit 841a123

Browse files
authored
Merge branch 'main' into fix-broken-links
2 parents 9ffcb72 + 59f5371 commit 841a123

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
toolchain: ${{ matrix.rust }}
3030
components: rustfmt
3131
profile: minimal
32-
- uses: arduino/setup-protoc@v1
32+
- uses: arduino/setup-protoc@v3
3333
- name: Test
3434
run: ./scripts/test.sh
3535
lint:
@@ -43,7 +43,7 @@ jobs:
4343
toolchain: stable
4444
components: rustfmt
4545
profile: minimal
46-
- uses: arduino/setup-protoc@v1
46+
- uses: arduino/setup-protoc@v3
4747
- uses: actions-rs/cargo@v1
4848
with:
4949
command: fmt
@@ -81,7 +81,7 @@ jobs:
8181
toolchain: stable
8282
components: rustfmt
8383
profile: minimal
84-
- uses: arduino/setup-protoc@v1
84+
- uses: arduino/setup-protoc@v3
8585
- name: Build
8686
run: |
8787
cd ${{ matrix.example }}
@@ -122,7 +122,7 @@ jobs:
122122
toolchain: nightly
123123
components: rustfmt
124124
override: true
125-
- uses: arduino/setup-protoc@v1
125+
- uses: arduino/setup-protoc@v3
126126
- name: doc
127127
run: cargo doc --no-deps --all-features
128128
env:
@@ -140,7 +140,7 @@ jobs:
140140
toolchain: stable
141141
components: rustfmt,llvm-tools-preview
142142
override: true
143-
- uses: arduino/setup-protoc@v1
143+
- uses: arduino/setup-protoc@v3
144144
- name: cargo install cargo-llvm-cov
145145
uses: taiki-e/install-action@cargo-llvm-cov
146146
- name: cargo generate-lockfile

.github/workflows/integration_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
toolchain: stable
2626
components: rustfmt
2727
profile: minimal
28-
- uses: arduino/setup-protoc@v1
28+
- uses: arduino/setup-protoc@v3
2929
- name: Run integration tests using docker compose
3030
run: ./scripts/integration_tests.sh

opentelemetry-zipkin/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ opentelemetry-http = { version = "0.10", path = "../opentelemetry-http" }
3434
opentelemetry-semantic-conventions = { version = "0.13", path = "../opentelemetry-semantic-conventions" }
3535
serde_json = { workspace = true }
3636
serde = { workspace = true, features = ["derive"] }
37-
typed-builder = "0.12"
37+
typed-builder = "0.18"
3838
http = { workspace = true }
3939
reqwest = { workspace = true, optional = true}
4040
thiserror = { workspace = true }

0 commit comments

Comments
 (0)