Update to latest protox

andrewhickman · Sep 2, 2023 · 1109787 · 1109787
1 parent 340ecf4
commit 1109787
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 120 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,52 +31,52 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - run: cargo test --all-features
 
-  # lints:
-  #   name: Lints
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: dtolnay/rust-toolchain@v1
-  #       with:
-  #         toolchain: stable
-  #         components: clippy, rustfmt
-  #     - name: Get latest CMake and ninja
-  #       uses: lukka/get-cmake@latest
-  #     - name: Install Protoc
-  #       uses: arduino/setup-protoc@v1
-  #       with:
-  #         repo-token: ${{ secrets.GITHUB_TOKEN }}
-  #     - run: cargo fmt --all -- --check
-  #     - run: cargo clippy --all -- -D warnings
-  #     - run: cargo check
-  #     - run: cargo check --package prost-reflect --no-default-features
-  #     - run: cargo check --package prost-reflect --no-default-features --features=text-format
-  #     - run: cargo check --package prost-reflect --no-default-features --features=serde
-  #     - run: cargo check --package prost-reflect --all-features
-  #     - name: Check README.md is up-to-date
-  #       shell: pwsh
-  #       run: |
-  #         ./generate-readme.ps1
-  #         if (git diff README.md) {
-  #           Write-Error "README.md is out-of-date, run generate-readme.ps1 to regenerate it." -ErrorAction Stop
-  #         }
+  lints:
+    name: Lints
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@v1
+        with:
+          toolchain: stable
+          components: clippy, rustfmt
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@latest
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - run: cargo fmt --all -- --check
+      - run: cargo clippy --all -- -D warnings
+      - run: cargo check
+      - run: cargo check --package prost-reflect --no-default-features
+      - run: cargo check --package prost-reflect --no-default-features --features=text-format
+      - run: cargo check --package prost-reflect --no-default-features --features=serde
+      - run: cargo check --package prost-reflect --all-features
+      - name: Check README.md is up-to-date
+        shell: pwsh
+        run: |
+          ./generate-readme.ps1
+          if (git diff README.md) {
+            Write-Error "README.md is out-of-date, run generate-readme.ps1 to regenerate it." -ErrorAction Stop
+          }
 
-  # coverage:
-  #   name: Coverage
-  #   runs-on: ubuntu-latest
-  #   container:
-  #     image: xd009642/tarpaulin:develop
-  #     options: --security-opt seccomp=unconfined
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Install Protoc
-  #       uses: arduino/setup-protoc@v1
-  #       with:
-  #         repo-token: ${{ secrets.GITHUB_TOKEN }}
-  #     - name: Generate code coverage
-  #       run: |
-  #         cargo tarpaulin --verbose --packages prost-reflect prost-reflect-tests --all-features --timeout 120 --out xml
-  #     - name: Upload to codecov.io
-  #       uses: codecov/codecov-action@v3
-  #       with:
-  #         fail_ci_if_error: true
+  coverage:
+    name: Coverage
+    runs-on: ubuntu-latest
+    container:
+      image: xd009642/tarpaulin:develop
+      options: --security-opt seccomp=unconfined
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Generate code coverage
+        run: |
+          cargo tarpaulin --verbose --packages prost-reflect prost-reflect-tests --all-features --timeout 120 --out xml
+      - name: Upload to codecov.io
+        uses: codecov/codecov-action@v3
+        with:
+          fail_ci_if_error: true
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,6 +12,5 @@ members = [
 allow-branch = ["main"]
 consolidate-commits = false
 
-# [patch.crates-io]
-# prost-reflect = { path = "prost-reflect" }
-# prost = "0.12.0"
+[patch.crates-io]
+prost-reflect = { path = "prost-reflect" }
diff --git a/prost-reflect/Cargo.toml b/prost-reflect/Cargo.toml
@@ -46,7 +46,7 @@ once_cell = "1.13.0"
 proptest = "1.0.0"
 prost-build = "0.12.0"
 prost-reflect-build = { path = "../prost-reflect-build" }
-protox = "0.4.0"
+protox = "0.5.0"
 serde_json = "1.0.82"
 serde_yaml = "0.9.25"
 similar-asserts = { version = "1.4.2", features = ["serde"] }