Merge branch 'main' into metrics_collect_stress_test

open-telemetry · Nov 1, 2024 · 7265639 · 7265639
2 parents b4fffe6 + e1860c7
commit 7265639
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,11 +73,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2024-05-01
+          toolchain: nightly-2024-06-30
           components: rustfmt
       - name: external-type-check
         run: |
-          cargo install cargo-check-external-types
+          cargo install cargo-check-external-types@0.1.13
           cd ${{ matrix.example }}
           cargo check-external-types --config allowed-external-types.toml
   non-default-examples:

diff --git a/Cargo.toml b/Cargo.toml
@@ -30,7 +30,7 @@ hyper-util = "0.1"
 log = "0.4.21"
 once_cell = "1.13"
 ordered-float = "4.0"
-pin-project-lite = "=0.2.14" # 0.2.15 is failing for cargo-check-external-types
+pin-project-lite = "0.2"
 prost = "0.13"
 prost-build = "0.13"
 prost-types = "0.13"