Skip to content

Commit 684dddd

Browse files
committed
Don't checkout submodules by default
This makes sure that cargo does not clone and checkout all the submodules if pointing to this repository as a git dependency. To checkout the submodules `git submodule update --checkout` can be used.
1 parent 709ae28 commit 684dddd

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

.github/workflows/CI.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,13 @@ jobs:
145145
- uses: actions/checkout@v3
146146
with:
147147
submodules: recursive
148+
set-safe-directory: true
148149
- uses: actions-rs/toolchain@v1
149150
with:
150151
profile: minimal
151152
toolchain: stable
152153
override: true
154+
- run: git submodule update --checkout
153155
- run: python3 generator.py
154156
- run: git diff --exit-code
155157

@@ -160,11 +162,13 @@ jobs:
160162
- uses: actions/checkout@v3
161163
with:
162164
submodules: recursive
165+
set-safe-directory: true
163166
- uses: actions-rs/toolchain@v1
164167
with:
165168
profile: minimal
166169
toolchain: stable
167170
override: true
171+
- run: git submodule update --checkout
168172
- run: cargo install rustdoc-stripper
169173
- run: python3 generator.py --embed-docs
170174
- run: python3 generator.py --strip-docs

.github/workflows/docs.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ jobs:
1212
docs:
1313
runs-on: ubuntu-latest
1414
name: build
15-
container:
16-
image: ghcr.io/gtk-rs/gtk-rs-core/core:latest
1715
env:
1816
RELEASES: |
1917
0.15=0.15
@@ -23,14 +21,14 @@ jobs:
2321
- uses: actions/checkout@v3
2422
with:
2523
submodules: recursive
24+
set-safe-directory: true
2625
- uses: actions-rs/toolchain@v1
2726
with:
2827
profile: minimal
2928
toolchain: nightly
3029
override: true
3130
components: rustfmt
32-
- working-directory: gir
33-
run: cargo build --release
31+
- run: git submodule update --checkout
3432
- run: cargo install rustdoc-stripper
3533
- run: python3 ./generator.py --embed-docs --yes ./
3634
- run: git clone https://gitlab.gnome.org/World/Rust/gir-rustdoc/ # checkout action doesn't support random urls

.gitmodules

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[submodule "gir"]
22
path = gir
33
url = https://github.com/gtk-rs/gir
4+
update = none
45
[submodule "gir-files"]
56
path = gir-files
67
url = https://github.com/gtk-rs/gir-files
8+
update = none

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,18 @@ crates like `glib-rs`.
3636

3737
## Regenerating
3838

39-
To regenerate crates using [gir], please use the `generator.py`
40-
file as follows:
39+
To regenerate crates using [gir], please use the `generator.py` file as follows:
4140

4241
```bash
4342
$ python3 generator.py
4443
```
4544

45+
If you didn't do so yet, please check out all the submodules before via
46+
47+
```bash
48+
$ git submodule update --checkout
49+
```
50+
4651
## Development
4752

4853
This repository is mostly split into two branches: `master` and `crate`.

0 commit comments

Comments
 (0)