Skip to content

Commit

Permalink
Remove build.rs (#657)
Browse files Browse the repository at this point in the history
Co-authored-by: Marcus Griep <marcus@griep.us>
  • Loading branch information
LucioFranco and neoeinstein committed Jun 28, 2022
1 parent 38ba547 commit ac57645
Show file tree
Hide file tree
Showing 33 changed files with 141 additions and 246 deletions.
34 changes: 16 additions & 18 deletions .github/workflows/continuous-integration-workflow.yaml
Expand Up @@ -37,6 +37,10 @@ jobs:
default: true
profile: minimal
components: clippy
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: install ninja
uses: seanmiddleditch/gha-setup-ninja@v3
- name: clippy
Expand All @@ -59,6 +63,10 @@ jobs:
- uses: actions/checkout@v2
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
Expand Down Expand Up @@ -96,6 +104,10 @@ jobs:
toolchain: ${{ matrix.toolchain }}
default: true
profile: minimal
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: install ninja
uses: seanmiddleditch/gha-setup-ninja@v3
- uses: Swatinem/rust-cache@v1
Expand Down Expand Up @@ -123,6 +135,10 @@ jobs:
toolchain: nightly
default: true
profile: minimal
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: Swatinem/rust-cache@v1
- name: install cargo-no-std-check
uses: actions-rs/cargo@v1
Expand All @@ -149,21 +165,3 @@ jobs:
with:
command: check
args: --manifest-path prost-build/Cargo.toml

vendored:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v2
with:
submodules: recursive
- name: install toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
default: true
profile: minimal
- uses: Swatinem/rust-cache@v1
- name: cargo check
run: cd test-vendored && cargo check

2 changes: 2 additions & 0 deletions .gitignore
@@ -1,2 +1,4 @@
target
Cargo.lock

.DS_Store
1 change: 0 additions & 1 deletion Cargo.toml
Expand Up @@ -33,7 +33,6 @@ exclude = [
"fuzz",
# Same counts for the afl fuzz targets
"afl",
"test-vendored"
]

[lib]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 3 additions & 7 deletions prost-build/Cargo.toml
Expand Up @@ -14,7 +14,6 @@ edition = "2018"

[features]
default = []
vendored = []
# When MSRV moves to 1.60, these can change to dep:
cleanup-markdown = ["pulldown-cmark", "pulldown-cmark-to-cmark"]

Expand All @@ -30,15 +29,12 @@ prost-types = { version = "0.10.0", path = "../prost-types", default-features =
tempfile = "3"
lazy_static = "1.4.0"
regex = { version = "1.5.5", default-features = false, features = ["std", "unicode-bool"] }
# These two must be kept in sync
which = "4"

# These two must be kept in sync, used for `cleanup-markdown` feature.
pulldown-cmark = { version = "0.9.1", optional = true, default-features = false }
pulldown-cmark-to-cmark = { version = "10.0.1", optional = true }

[build-dependencies]
which = { version = "4", default-features = false }
cfg-if = "1"
cmake = "0.1"

[dev-dependencies]
env_logger = { version = "0.8", default-features = false }

120 changes: 0 additions & 120 deletions prost-build/build.rs

This file was deleted.

0 comments on commit ac57645

Please sign in to comment.