Skip to content

Commit

Permalink
Merge pull request #248 from mikeee/check-proto-diff
Browse files Browse the repository at this point in the history
feat: add proto check and make directives
  • Loading branch information
mikeee authored Nov 25, 2024
2 parents fcff470 + c4675a6 commit 1ac0191
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 17 deletions.
35 changes: 18 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:

jobs:
lint:
name: Lint
name: Check and Lint
runs-on: ubuntu-latest

steps:
Expand All @@ -37,14 +37,20 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
version: ${{ env.PROTOC_VERSION }}
- uses: actions/checkout@v4

- name: Check compiled protos for a diff
run: |
make proto-gen check-diff-proto
- name: cargo fmt
run: cargo fmt -- --check --color ${{ env.CARGO_TERM_COLOR }}

- name: cargo clippy
run: cargo clippy


build:
name: Build on rust-${{ matrix.rust-version}}
name: Test and Build on rust-${{ matrix.rust-version }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -71,32 +77,27 @@ jobs:
- name: Run Tests
run: cargo test --workspace --all-targets --all-features

test-docs-sdk:
name: Docs SDK
runs-on: ubuntu-latest
env:
RUSTDOCFLAGS: -Dwarnings
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
- uses: dtolnay/install@cargo-docs-rs
- run: cargo docs-rs -p dapr

test-docs-macros:
name: Docs Macros
test-docs:
name: Check Docs - ${{ matrix.crate }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
crate:
- dapr
- dapr-macros
env:
RUSTDOCFLAGS: -Dwarnings
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
- uses: dtolnay/install@cargo-docs-rs
- run: cargo docs-rs -p dapr-macros
- run: cargo docs-rs -p ${{ matrix.crate }}

publish:
name: Publish
runs-on: ubuntu-latest
needs: [test-docs-sdk, test-docs-macros, lint, build]
needs: [test-docs, lint, build]
if: startswith(github.ref, 'refs/tags/v')

steps:
Expand Down
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.PHONY: proto-gen
proto-gen:
cargo run --bin proto-gen

.PHONY: check-diff-proto
check-diff-proto:
git diff --exit-code ./proto/

0 comments on commit 1ac0191

Please sign in to comment.