Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sink #966

Closed
wants to merge 25 commits into from
Closed

Sink #966

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 89 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: CI
on: pull_request
on: [push, pull_request]

env:
PROTOC_VERSION: 3.20.3
Expand All @@ -12,8 +12,49 @@ jobs:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt
components: rustfmt
- run: cargo fmt --all --check
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: build b_tests
run: cargo build --package b_tests
- name: rustfmt
run: cargo fmt --all --check
# Disabled because downstream crates don't check this as well
# minversions:
# runs-on: ubuntu-latest
# steps:
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: nightly
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: stable
# - uses: actions/checkout@v3
# with:
# submodules: recursive
# - name: Install Protoc
# uses: arduino/setup-protoc@v1
# with:
# repo-token: ${{ secrets.GITHUB_TOKEN }}
# - name: install ninja
# uses: seanmiddleditch/gha-setup-ninja@v3
# - name: cargo update -Zminimal-versions
# uses: actions-rs/cargo@v1
# with:
# command: update
# toolchain: nightly
# args: -Zminimal-versions
# - name: cargo check
# uses: actions-rs/cargo@v1
# with:
# command: check
# args: --workspace --all-targets
# toolchain: stable

machete:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -90,6 +131,26 @@ jobs:
uses: taiki-e/install-action@v2
with:
tool: protoc@${{ env.PROTOC_VERSION }}
submodules: recursive
- name: install toolchain
uses: dtolnay/rust-toolchain@nightly
# no-std:
# runs-on: ubuntu-latest
# steps:
# - name: checkout
# uses: actions/checkout@v3
# with:
# submodules: recursive
# - name: install toolchain
# uses: actions-rs/toolchain@v1
# with:
# toolchain: nightly
# default: true
# profile: minimal
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: Swatinem/rust-cache@v2
- name: install cargo-no-std-check
uses: baptiste0928/cargo-install@v2
Expand All @@ -106,3 +167,29 @@ jobs:
# prost's default features to compile.
- name: prost-build check
run: cargo check --manifest-path prost-build/Cargo.toml
# - uses: Swatinem/rust-cache@v1
# - name: install cargo-no-std-check
# uses: actions-rs/cargo@v1
# with:
# command: install
# args: cargo-no-std-check
# - name: prost cargo-no-std-check
# uses: actions-rs/cargo@v1
# with:
# command: no-std-check
# args: --manifest-path Cargo.toml --no-default-features
# - name: prost-types cargo-no-std-check
# uses: actions-rs/cargo@v1
# with:
# command: no-std-check
# args: --manifest-path prost-types/Cargo.toml --no-default-features
# # prost-build depends on prost with --no-default-features, but when
# # prost-build is built through the workspace, prost typically has default
# # features enabled due to vagaries in Cargo workspace feature resolution.
# # This additional check ensures that prost-build does not rely on any of
# # prost's default features to compile.
# - name: prost-build check
# uses: actions-rs/cargo@v1
# with:
# command: check
# args: --manifest-path prost-build/Cargo.toml
9 changes: 9 additions & 0 deletions .idea/markdown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions .idea/prost.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

161 changes: 161 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ members = [
"tests-2015",
"tests-no-std",
"tests/single-include",
"b_tests",
]

exclude = [
Expand All @@ -49,6 +50,7 @@ std = []
[dependencies]
bytes = { version = "1", default-features = false }
prost-derive = { version = "0.12.3", path = "prost-derive", optional = true }
uuid = { version = "1", features = ["v4"] }

[dev-dependencies]
criterion = { version = "0.4", default-features = false }
Expand Down
3 changes: 3 additions & 0 deletions b_tests/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/src/b_generated
/src/generated
/src/protos
14 changes: 14 additions & 0 deletions b_tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[package]
name = "b_tests"
version = "0.1.0"
authors = ["Jasper Visser <[email protected]>"]
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[build-dependencies]
prost-build = { path = "../prost-build" }
protobuf_strict = { git = "https://github.com/Jasperav/protobuf_strict.git" }

[dependencies]
uuid = { version = "1", features = ["v4"] }
prost = { path = "../" }
Loading
Loading