diff options
| author | Matthieu <matthieu@developershouse.xyz> | 2021-08-06 19:04:19 +0400 |
|---|---|---|
| committer | Matthieu <matthieu@developershouse.xyz> | 2021-08-06 19:04:19 +0400 |
| commit | d859ba28a58ddb72e776c8fa25277b6a0cd1b62d (patch) | |
| tree | 32680f9d089f3bb59555efbc6b47f80a43fb1abf | |
| parent | f68cb4a01dd970036730571f4f3e5b779e455c5b (diff) | |
| parent | 2a3bbd919813d1bd343a56be57cf8dea9a6bb8da (diff) | |
resolve merge conflicts
| -rw-r--r-- | .github/workflows/bazel-build.yml | 2 | ||||
| -rw-r--r-- | .vscode/settings.json | 2 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | rest-ratelimiter/Cargo.toml | 44 |
4 files changed, 31 insertions, 25 deletions
diff --git a/.github/workflows/bazel-build.yml b/.github/workflows/bazel-build.yml index 19bafb4..555d6f5 100644 --- a/.github/workflows/bazel-build.yml +++ b/.github/workflows/bazel-build.yml @@ -41,8 +41,6 @@ jobs: # Runs a set of commands using the runners shell
- name: Execute build script
run: |
- bazel run //:gazelle
- bazel run @cargo_raze//:raze -- --manifest-path=$(realpath rest-ralimiter/Cargo.toml)
bazel build //...
- name: Bazel artifacts
uses: actions/upload-artifact@v2
diff --git a/.vscode/settings.json b/.vscode/settings.json index ebd1bbc..7c66c19 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,6 +5,6 @@ "**/.hg": true,
"**/CVS": true,
"**/.DS_Store": true,
- "**/bazel-*": true
+ "./bazel-*": true
}
}
\ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..7a319c9 --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +# Nova + +The futur of Bots on Discord! + +--- +### Todo + +- [ ] README diff --git a/rest-ratelimiter/Cargo.toml b/rest-ratelimiter/Cargo.toml index 4d23c5e..874ea26 100644 --- a/rest-ratelimiter/Cargo.toml +++ b/rest-ratelimiter/Cargo.toml @@ -1,22 +1,22 @@ -[package]
-name = "rest-ratelimiter"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-tonic = "0.5"
-prost = "0.8"
-tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
-
-[[bin]]
-name = "rest-ratelimiter"
-path = "src/main.rs"
-
-[dev-dependencies]
-tonic-build = "0.5"
-
-[package.metadata.raze]
-workspace_path = "//rest-ratelimiter/cargo"
-genmode = "Remote"
-default_gen_buildrs = true
-package_aliases_dir = "cargo"
+[package] +name = "rest-ratelimiter" +version = "0.1.0" +edition = "2018" + +[dependencies] +tonic = "0.5" +prost = "0.8" +tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] } + +[[bin]] +name = "rest-ratelimiter" +path = "src/main.rs" + +[dev-dependencies] +tonic-build = "0.5" + +[package.metadata.raze] +workspace_path = "//rest-ratelimiter/cargo" +genmode = "Remote" +default_gen_buildrs = true +package_aliases_dir = "cargo" |