Skip to content
This repository was archived by the owner on Mar 4, 2024. It is now read-only.

Commit 84d21a3

Browse files
Merge pull request #770 from sdroege/submodules-update-none
Don't checkout submodules by default
2 parents 862d534 + ec9a361 commit 84d21a3

File tree

20 files changed

+32
-22
lines changed

20 files changed

+32
-22
lines changed

.github/workflows/CI.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- stable
1919
- beta
2020
- nightly
21-
- "1.57.0"
21+
- "1.63.0"
2222
conf:
2323
- { name: "atk", features: "v2_34", test_sys: false } # disable for now, until we get 2.38 on the docker image
2424
- { name: "gdk", features: "v3_24", test_sys: true }
@@ -98,7 +98,7 @@ jobs:
9898
- stable
9999
- beta
100100
- nightly
101-
- "1.57.0"
101+
- "1.63.0"
102102
steps:
103103
- uses: actions/checkout@v2
104104
- uses: actions-rs/toolchain@v1
@@ -139,10 +139,12 @@ jobs:
139139
- uses: actions/checkout@v2
140140
with:
141141
submodules: recursive
142+
set-safe-directory: true
142143
- uses: actions-rs/toolchain@v1
143144
with:
144145
profile: minimal
145146
toolchain: stable
146147
override: true
148+
- run: git submodule update --checkout
147149
- run: python3 generator.py
148150
- run: git diff --exit-code

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ name: docs
1010

1111
jobs:
1212
docs:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-22.04
1414
name: build
1515
container:
1616
image: ghcr.io/gtk-rs/gtk3-rs/gtk3:latest
@@ -23,14 +23,14 @@ jobs:
2323
- uses: actions/checkout@v2
2424
with:
2525
submodules: recursive
26+
set-safe-directory: true
2627
- uses: actions-rs/toolchain@v1
2728
with:
2829
profile: minimal
2930
toolchain: nightly
3031
override: true
3132
components: rustfmt
32-
- working-directory: gir
33-
run: cargo build --release
33+
- run: git submodule update --checkout
3434
- run: cargo install rustdoc-stripper
3535
- run: python3 ./generator.py --embed-docs --yes ./
3636
- 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ information about each crate, please refer to their `README.md` file in their di
88

99
## Minimum supported Rust version
1010

11-
Currently, the minimum supported Rust version is `1.57.0`.
11+
Currently, the minimum supported Rust version is `1.63.0`.
1212

1313
## Documentation
1414

@@ -41,6 +41,12 @@ file as follows:
4141
$ python3 generator.py
4242
```
4343

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

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

atk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ exclude = [
1414
"gir-files/*",
1515
]
1616
edition = "2021"
17-
rust-version = "1.57"
17+
rust-version = "1.63"
1818

1919
[lib]
2020
name = "atk"

atk/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ATK __2.28__ is the lowest supported version for the underlying library.
99

1010
## Minimum supported Rust version
1111

12-
Currently, the minimum supported Rust version is `1.57.0`.
12+
Currently, the minimum supported Rust version is `1.63.0`.
1313

1414
## Documentation
1515

atk/sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ name = "atk-sys"
3838
repository = "https://github.com/gtk-rs/gtk3-rs"
3939
version = "0.16.0"
4040
edition = "2021"
41-
rust-version = "1.57"
41+
rust-version = "1.63"
4242
[package.metadata.docs.rs]
4343
features = ["dox"]
4444
[package.metadata.system-deps.atk]

gdk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ exclude = [
1313
"gir-files/*",
1414
]
1515
edition = "2021"
16-
rust-version = "1.57"
16+
rust-version = "1.63"
1717

1818
[lib]
1919
name = "gdk"

gdk/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GDK __3.22__ is the lowest supported version for the underlying library.
99

1010
## Minimum supported Rust version
1111

12-
Currently, the minimum supported Rust version is `1.57.0`.
12+
Currently, the minimum supported Rust version is `1.63.0`.
1313

1414
## Documentation
1515

gdk/sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ name = "gdk-sys"
5252
repository = "https://github.com/gtk-rs/gtk3-rs"
5353
version = "0.16.0"
5454
edition = "2021"
55-
rust-version = "1.57"
55+
rust-version = "1.63"
5656
[package.metadata.docs.rs]
5757
features = ["dox"]
5858
[package.metadata.system-deps.gdk_3_0]

0 commit comments

Comments
 (0)