Skip to content

Commit fd005dc

Browse files
authored
Fix cargo-raze version and check the diff. (proxy-wasm#107)
Signed-off-by: mathetake <[email protected]>
1 parent 5b517e5 commit fd005dc

File tree

60 files changed

+427
-387
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+427
-387
lines changed

.github/workflows/cargo.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Copyright 2020 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: Cargo
16+
17+
on:
18+
pull_request:
19+
branches:
20+
- master
21+
paths:
22+
- 'bazel/cargo/**'
23+
24+
push:
25+
branches:
26+
- master
27+
paths:
28+
- 'bazel/cargo/**'
29+
30+
jobs:
31+
32+
format:
33+
runs-on: ubuntu-latest
34+
35+
steps:
36+
- uses: actions/checkout@v2
37+
38+
- name: Format (cargo raze)
39+
working-directory: bazel/cargo
40+
run: |
41+
cargo install cargo-raze --version 0.7.0
42+
cargo generate-lockfile
43+
cargo raze
44+
git diff --exit-code

.github/workflows/cpp.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
go get -u github.com/bazelbuild/buildtools/buildifier
4848
export PATH=$PATH:$(go env GOPATH)/bin
4949
find . -name "BUILD" | xargs -n1 buildifier -mode=check
50+
5051
- name: Format (addlicense)
5152
run: |
5253
go get -u github.com/google/addlicense

bazel/cargo/BUILD.bazel

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
22
@generated
3-
cargo-raze workspace build file.
3+
cargo-raze generated Bazel file.
44
55
DO NOT EDIT! Replaced on runs of cargo-raze
66
"""
@@ -14,7 +14,7 @@ licenses([
1414
# Aliased targets
1515
alias(
1616
name = "anyhow",
17-
actual = "@proxy_wasm_cpp_host_raze___anyhow__1_0_34//:anyhow",
17+
actual = "@proxy_wasm_cpp_host__anyhow__1_0_35//:anyhow",
1818
tags = [
1919
"cargo-raze",
2020
"manual",
@@ -23,7 +23,7 @@ alias(
2323

2424
alias(
2525
name = "env_logger",
26-
actual = "@proxy_wasm_cpp_host_raze___env_logger__0_8_1//:env_logger",
26+
actual = "@proxy_wasm_cpp_host__env_logger__0_8_2//:env_logger",
2727
tags = [
2828
"cargo-raze",
2929
"manual",
@@ -32,7 +32,7 @@ alias(
3232

3333
alias(
3434
name = "indexmap",
35-
actual = "@proxy_wasm_cpp_host_raze___indexmap__1_1_0//:indexmap",
35+
actual = "@proxy_wasm_cpp_host__indexmap__1_1_0//:indexmap",
3636
tags = [
3737
"cargo-raze",
3838
"manual",
@@ -41,7 +41,7 @@ alias(
4141

4242
alias(
4343
name = "object",
44-
actual = "@proxy_wasm_cpp_host_raze___object__0_21_1//:object",
44+
actual = "@proxy_wasm_cpp_host__object__0_21_1//:object",
4545
tags = [
4646
"cargo-raze",
4747
"manual",
@@ -50,7 +50,7 @@ alias(
5050

5151
alias(
5252
name = "once_cell",
53-
actual = "@proxy_wasm_cpp_host_raze___once_cell__1_4_1//:once_cell",
53+
actual = "@proxy_wasm_cpp_host__once_cell__1_5_2//:once_cell",
5454
tags = [
5555
"cargo-raze",
5656
"manual",
@@ -59,7 +59,7 @@ alias(
5959

6060
alias(
6161
name = "wasmtime",
62-
actual = "@proxy_wasm_cpp_host_raze___wasmtime__0_21_0//:wasmtime",
62+
actual = "@proxy_wasm_cpp_host__wasmtime__0_21_0//:wasmtime",
6363
tags = [
6464
"cargo-raze",
6565
"manual",
@@ -68,7 +68,7 @@ alias(
6868

6969
alias(
7070
name = "wasmtime_c_api_macros",
71-
actual = "@proxy_wasm_cpp_host_raze___wasmtime_c_api_macros__0_19_0//:wasmtime_c_api_macros",
71+
actual = "@proxy_wasm_cpp_host__wasmtime_c_api_macros__0_19_0//:wasmtime_c_api_macros",
7272
tags = [
7373
"cargo-raze",
7474
"manual",

bazel/cargo/Cargo.lock

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/cargo/Cargo.toml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@ name = "wasmtime-c-api-bazel"
44
version = "0.21.0"
55

66
[lib]
7-
crate-type = ["staticlib", "cdylib"]
8-
doc = false
9-
doctest = false
10-
name = "wasmtime"
11-
path = "src/lib.rs"
12-
proc-macro = true
13-
test = false
7+
path = "fake_lib.rs"
148

159
[dependencies]
1610
anyhow = "1.0"
@@ -21,46 +15,46 @@ once_cell = "1.3"
2115
wasmtime = {version = "0.21.0", default-features = false}
2216
wasmtime-c-api-macros = {git = "https://github.com/bytecodealliance/wasmtime", tag = "v0.21.0", path = "crates/c-api/macros"}
2317

24-
[raze]
25-
gen_workspace_prefix = "proxy_wasm_cpp_host_raze_"
18+
[package.metadata.raze]
19+
gen_workspace_prefix = "proxy_wasm_cpp_host"
2620
genmode = "Remote"
2721
workspace_path = "//bazel/cargo"
2822

29-
[raze.crates.target-lexicon.'0.11.1']
23+
[package.metadata.raze.crates.target-lexicon.'0.11.1']
3024
additional_flags = [
3125
"--cfg=feature=\\\"force_unix_path_separator\\\"",
3226
]
3327
gen_buildrs = true
3428

35-
[raze.crates.proc-macro2.'1.0.24']
29+
[package.metadata.raze.crates.proc-macro2.'1.0.24']
3630
additional_flags = [
3731
"--cfg=use_proc_macro",
3832
]
3933

40-
[raze.crates.log.'0.4.11']
34+
[package.metadata.raze.crates.log.'0.4.11']
4135
additional_flags = [
4236
"--cfg=atomic_cas",
4337
]
4438

45-
[raze.crates.indexmap.'1.1.0']
39+
[package.metadata.raze.crates.indexmap.'1.1.0']
4640
additional_flags = [
4741
"--cfg=feature=\\\"serde-1\\\"",
4842
]
4943

50-
[raze.crates.raw-cpuid.'7.0.3']
44+
[package.metadata.raze.crates.raw-cpuid.'7.0.3']
5145
additional_flags = [
5246
"--cfg=feature=\\\"bindgen\\\"",
5347
]
5448
gen_buildrs = true
5549

56-
[raze.crates.cranelift-codegen.'0.68.0']
50+
[package.metadata.raze.crates.cranelift-codegen.'0.68.0']
5751
additional_flags = [
5852
"--cfg=feature=\\\"enable-serde\\\"",
5953
"--cfg=feature=\\\"bindgen\\\"",
6054
]
6155
gen_buildrs = true
6256

63-
[raze.crates.psm.'0.1.11']
57+
[package.metadata.raze.crates.psm.'0.1.11']
6458
additional_flags = [
6559
"--cfg=asm",
6660
"--cfg=feature=\\\"bindgen\\\"",

0 commit comments

Comments
 (0)