Skip to content

Commit ac57645

Browse files
Remove build.rs (#657)
Co-authored-by: Marcus Griep <[email protected]>
1 parent 38ba547 commit ac57645

33 files changed

+141
-246
lines changed

.github/workflows/continuous-integration-workflow.yaml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ jobs:
3737
default: true
3838
profile: minimal
3939
components: clippy
40+
- name: Install Protoc
41+
uses: arduino/setup-protoc@v1
42+
with:
43+
repo-token: ${{ secrets.GITHUB_TOKEN }}
4044
- name: install ninja
4145
uses: seanmiddleditch/gha-setup-ninja@v3
4246
- name: clippy
@@ -59,6 +63,10 @@ jobs:
5963
- uses: actions/checkout@v2
6064
with:
6165
submodules: recursive
66+
- name: Install Protoc
67+
uses: arduino/setup-protoc@v1
68+
with:
69+
repo-token: ${{ secrets.GITHUB_TOKEN }}
6270
- name: install ninja
6371
uses: seanmiddleditch/gha-setup-ninja@v3
6472
- name: cargo update -Zminimal-versions
@@ -96,6 +104,10 @@ jobs:
96104
toolchain: ${{ matrix.toolchain }}
97105
default: true
98106
profile: minimal
107+
- name: Install Protoc
108+
uses: arduino/setup-protoc@v1
109+
with:
110+
repo-token: ${{ secrets.GITHUB_TOKEN }}
99111
- name: install ninja
100112
uses: seanmiddleditch/gha-setup-ninja@v3
101113
- uses: Swatinem/rust-cache@v1
@@ -123,6 +135,10 @@ jobs:
123135
toolchain: nightly
124136
default: true
125137
profile: minimal
138+
- name: Install Protoc
139+
uses: arduino/setup-protoc@v1
140+
with:
141+
repo-token: ${{ secrets.GITHUB_TOKEN }}
126142
- uses: Swatinem/rust-cache@v1
127143
- name: install cargo-no-std-check
128144
uses: actions-rs/cargo@v1
@@ -149,21 +165,3 @@ jobs:
149165
with:
150166
command: check
151167
args: --manifest-path prost-build/Cargo.toml
152-
153-
vendored:
154-
runs-on: ubuntu-latest
155-
steps:
156-
- name: checkout
157-
uses: actions/checkout@v2
158-
with:
159-
submodules: recursive
160-
- name: install toolchain
161-
uses: actions-rs/toolchain@v1
162-
with:
163-
toolchain: stable
164-
default: true
165-
profile: minimal
166-
- uses: Swatinem/rust-cache@v1
167-
- name: cargo check
168-
run: cd test-vendored && cargo check
169-

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
target
22
Cargo.lock
3+
4+
.DS_Store

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ exclude = [
3333
"fuzz",
3434
# Same counts for the afl fuzz targets
3535
"afl",
36-
"test-vendored"
3736
]
3837

3938
[lib]
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.

prost-build/Cargo.toml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ edition = "2018"
1414

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

@@ -30,15 +29,12 @@ prost-types = { version = "0.10.0", path = "../prost-types", default-features =
3029
tempfile = "3"
3130
lazy_static = "1.4.0"
3231
regex = { version = "1.5.5", default-features = false, features = ["std", "unicode-bool"] }
33-
# These two must be kept in sync
32+
which = "4"
33+
34+
# These two must be kept in sync, used for `cleanup-markdown` feature.
3435
pulldown-cmark = { version = "0.9.1", optional = true, default-features = false }
3536
pulldown-cmark-to-cmark = { version = "10.0.1", optional = true }
3637

37-
[build-dependencies]
38-
which = { version = "4", default-features = false }
39-
cfg-if = "1"
40-
cmake = "0.1"
41-
4238
[dev-dependencies]
4339
env_logger = { version = "0.8", default-features = false }
4440

prost-build/build.rs

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)