Skip to content

Commit fafa97f

Browse files
authored
chore: remove protobuf submodule and leverage cmake for it (#1389)
1 parent e0643e2 commit fafa97f

File tree

5 files changed

+222
-118
lines changed

5 files changed

+222
-118
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ name: CI
22

33
on:
44
push:
5-
branches: [ "master" ]
5+
branches: ["master"]
66
pull_request:
77
merge_group:
8-
branches: [ "master" ]
8+
branches: ["master"]
99

1010
permissions:
1111
contents: read
1212

1313
env:
14-
PROTOC_VERSION: '3.25.3'
15-
clippy_rust_version: '1.87'
14+
PROTOC_VERSION: "3.25.3"
15+
clippy_rust_version: "1.87"
1616

1717
jobs:
1818
# Depends on all actions that are required for a "successful" CI run.
@@ -60,8 +60,6 @@ jobs:
6060
runs-on: ubuntu-latest
6161
steps:
6262
- uses: actions/checkout@v6
63-
with:
64-
submodules: 'recursive'
6563
- name: install protoc
6664
uses: taiki-e/install-action@v2
6765
with:
@@ -74,7 +72,7 @@ jobs:
7472
components: clippy
7573
- run: cargo clippy --workspace --exclude protobuf --all-features --tests -- -D warnings
7674
- name: enable edition 2024 lints in `prost-derive` macros
77-
run: sed -i 's/edition = "[0-9]*"/edition = "2024"/' Cargo.toml
75+
run: sed -i 's/edition = "[0-9]*"/edition = "2024"/' Cargo.toml
7876
- name: set MSRV to clippy version to enable more lints
7977
run: sed -i 's/rust-version = "[.0-9]*"/rust-version = "${{ env.clippy_rust_version }}"/' Cargo.toml
8078
- name: clippy with edition 2024
@@ -84,8 +82,6 @@ jobs:
8482
runs-on: ubuntu-latest
8583
steps:
8684
- uses: actions/checkout@v6
87-
with:
88-
submodules: 'recursive'
8985
- name: install protoc
9086
uses: taiki-e/install-action@v2
9187
with:
@@ -112,8 +108,6 @@ jobs:
112108
runs-on: ubuntu-latest
113109
steps:
114110
- uses: actions/checkout@v6
115-
with:
116-
submodules: 'recursive'
117111
- uses: dtolnay/rust-toolchain@nightly
118112
- name: install protoc
119113
uses: taiki-e/install-action@v2
@@ -140,8 +134,6 @@ jobs:
140134
- windows-latest
141135
steps:
142136
- uses: actions/checkout@v6
143-
with:
144-
submodules: 'recursive'
145137
- name: install toolchain (${{ matrix.toolchain }})
146138
uses: dtolnay/rust-toolchain@master
147139
with:

.gitmodules

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

flake.lock

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

flake.nix

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,32 @@
66
flake-utils.url = "github:numtide/flake-utils";
77
};
88

9-
outputs = { self, nixpkgs, flake-utils }:
10-
flake-utils.lib.eachDefaultSystem (system:
9+
outputs =
10+
{
11+
self,
12+
nixpkgs,
13+
flake-utils,
14+
}:
15+
flake-utils.lib.eachDefaultSystem (
16+
system:
1117
let
1218
pkgs = import nixpkgs { inherit system; };
1319
in
1420
{
1521
devShells.default = pkgs.mkShell {
16-
packages = with pkgs; [ cargo rustc ];
17-
buildInputs = with pkgs; [ pkg-config protobuf curl cmake ninja ];
22+
packages = with pkgs; [
23+
cargo
24+
rustc
25+
rustfmt
26+
];
27+
buildInputs = with pkgs; [
28+
pkg-config
29+
protobuf
30+
curl
31+
cmake
32+
ninja
33+
];
1834
};
19-
});
35+
}
36+
);
2037
}

0 commit comments

Comments
 (0)