Skip to content

Commit 25ae337

Browse files
SimaoMoreira5228SimaoMoreira5228
authored
Merge branch 'main' into simao/dotslash
2 parents 537691e + a47c3de commit 25ae337

Some content is hidden

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

54 files changed

+1100
-713
lines changed

‎.bazelrc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,6 @@ common --disk_cache=~/.cache/scuffle/bazel/disk
151151
common --repository_cache=~/.cache/scuffle/bazel/repo
152152
common --experimental_repository_cache_hardlinks
153153

154-
###############################################################################
155-
## Docker configuration
156-
###############################################################################
157-
common --extra_toolchains=@rules_img_tool//toolchain:all
158-
159154
###############################################################################
160155
## Custom user flags
161156
##

‎.editorconfig‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
root = true
44

5+
[*]
6+
end_of_line = lf
7+
insert_final_newline = true
8+
charset = utf-8
9+
indent_style = space
10+
indent_size = 4
11+
trim_trailing_whitespace = true
12+
513
[*.sh]
614
indent_style = space
715
indent_size = 4
@@ -14,14 +22,6 @@ space_redirects = true
1422
[*.md]
1523
trim_trailing_whitespace = false
1624

17-
[*.yaml,*.yml,*.proto,*.cedar,*.cedarschema]
25+
[{*.yaml,*.yml,*.proto,*.cedar,*.cedarschema}]
1826
indent_style = space
1927
indent_size = 2
20-
21-
[*]
22-
end_of_line = lf
23-
insert_final_newline = true
24-
charset = utf-8
25-
indent_style = space
26-
indent_size = 4
27-
trim_trailing_whitespace = true

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@ MODULE.bazel.lock
4343

4444
# Turbo
4545
.turbo/
46+
47+
# diesel
48+
.diesel_lock

‎.vscode/extensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"editorconfig.editorconfig",
88
"bazelbuild.vscode-bazel",
99
"skellock.just",
10-
"zxh404.vscode-proto3"
10+
"bufbuild.vscode-buf",
1111
]
1212
}

‎CONTRIBUTING.md‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -113,21 +113,20 @@ Linting is done through bazel as well, formatting is done via `just fmt` which u
113113

114114
## Local Commnads
115115

116-
| Command | Description |
117-
| ------------------------- | ------------------------------------------------- |
118-
| `just test` | Run all tests |
119-
| `just grind` | Run tests with valgrind |
120-
| `just lint` | Lint the code & try auto-fix linting errors |
121-
| `just fmt` | Format the code |
122-
| `just deny` | Check that all dependencies have allowed licenses |
123-
| `just docs` | Build the docs |
124-
| `just docs-serve` | Serve the docs locally |
125-
| `just vendor` | Vendor the dependencies |
126-
| `just clear-tool-cache` | Clear the tool cache |
127-
| `just sync-readme` | Sync the readme for all crates |
128-
| `just sync-diesel-schema` | Sync the diesel schema for all crates |
129-
| `pnpm dev` | Start all frontends dev servers |
130-
| `pnpm dev:dashboard` | Start the dashboard dev server |
116+
| Command | Description |
117+
| ----------------------- | ------------------------------------------------- |
118+
| `just test` | Run all tests |
119+
| `just grind` | Run tests with valgrind |
120+
| `just lint` | Lint the code & try auto-fix linting errors |
121+
| `just fmt` | Format the code |
122+
| `just deny` | Check that all dependencies have allowed licenses |
123+
| `just docs` | Build the docs |
124+
| `just docs-serve` | Serve the docs locally |
125+
| `just vendor` | Vendor the dependencies |
126+
| `just clear-tool-cache` | Clear the tool cache |
127+
| `just sync-readme` | Sync the readme for all crates |
128+
| `pnpm dev` | Start all frontends dev servers |
129+
| `pnpm dev:dashboard` | Start the dashboard dev server |
131130

132131
## CLA
133132

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ members = [
1111
"cloud/geo-ip",
1212
"cloud/id",
1313
"cloud/proto",
14+
"cloud/video/api",
15+
"cloud/video/api/traits",
1416
"cloud/video/ingest",
17+
"cloud/video/ingest/traits",
1518
"crates/aac",
1619
"crates/amf0",
1720
"crates/av1",
@@ -53,6 +56,8 @@ members = [
5356
"misc/utils/rust/analyzer/check",
5457
"misc/utils/rust/analyzer/discover",
5558
"misc/utils/rust/clippy",
59+
"misc/utils/rust/diesel_migration/copy",
60+
"misc/utils/rust/diesel_migration/patcher",
5661
"misc/utils/rust/diesel_migration/runner",
5762
"misc/utils/rust/diesel_migration/test",
5863
"misc/utils/rust/doc/merger",
@@ -66,7 +71,6 @@ members = [
6671
"misc/utils/rust/test_runner",
6772
"tools/cargo/clippy",
6873
"tools/cargo/sync-readme",
69-
"tools/diesel-schema",
7074
]
7175

7276
resolver = "3"

‎Justfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ run bin *args:
4444
bazel run //cloud/email:bin -- {{ args }}
4545
elif [ {{ bin }} == "ingest" ]; then
4646
bazel run //cloud/video/ingest:bin -- {{ args }}
47+
elif [ {{ bin }} == "video-api" ]; then
48+
bazel run //cloud/video/api:bin -- {{ args }}
4749
else
4850
echo "Unknown binary: {{ bin }}"
4951
exit 1
@@ -98,9 +100,6 @@ alias sync-rdme := sync-readme
98100
sync-readme:
99101
bazel run //tools/cargo/sync-readme:fix
100102

101-
sync-diesel-schema:
102-
bazel run //tools/diesel-schema:fix
103-
104103
test *targets="//...":
105104
#!/usr/bin/env bash
106105
set -exuo pipefail

‎MODULE.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module(
55

66
bazel_dep(name = "bazel_skylib", version = "1.8.2")
77
bazel_dep(name = "rules_shell", version = "0.5.0")
8+
bazel_dep(name = "rules_sh", version = "0.5.0")
89
bazel_dep(name = "platforms", version = "1.0.0")
910
bazel_dep(name = "rules_cc", version = "0.2.4")
1011
bazel_dep(name = "aspect_bazel_lib", version = "2.21.1")

‎cargo_targets.bzl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ _packages = [
99
"//cloud/email/traits",
1010
"//cloud/geo-ip",
1111
"//cloud/video/ingest",
12+
"//cloud/video/ingest/traits",
13+
"//cloud/video/api",
14+
"//cloud/video/api/traits",
1215
"//cloud/id",
1316
"//cloud/proto",
1417
"//crates/aac",
@@ -54,6 +57,7 @@ _packages = [
5457
"//misc/utils/rust/clippy",
5558
"//misc/utils/rust/diesel_migration/runner",
5659
"//misc/utils/rust/diesel_migration/test",
60+
"//misc/utils/rust/diesel_migration/patcher",
5761
"//misc/utils/rust/test_runner",
5862
"//misc/utils/rust/test_runner/lib",
5963
"//misc/utils/rust/doc/test/runner",

0 commit comments

Comments
 (0)