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

Commit

Permalink
Merge pull request #770 from sdroege/submodules-update-none
Browse files Browse the repository at this point in the history
Don't checkout submodules by default
  • Loading branch information
GuillaumeGomez authored Sep 4, 2022
2 parents 862d534 + ec9a361 commit 84d21a3
Show file tree
Hide file tree
Showing 20 changed files with 32 additions and 22 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- stable
- beta
- nightly
- "1.57.0"
- "1.63.0"
conf:
- { name: "atk", features: "v2_34", test_sys: false } # disable for now, until we get 2.38 on the docker image
- { name: "gdk", features: "v3_24", test_sys: true }
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
- stable
- beta
- nightly
- "1.57.0"
- "1.63.0"
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -139,10 +139,12 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
set-safe-directory: true
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- run: git submodule update --checkout
- run: python3 generator.py
- run: git diff --exit-code
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: docs

jobs:
docs:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: build
container:
image: ghcr.io/gtk-rs/gtk3-rs/gtk3:latest
Expand All @@ -23,14 +23,14 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
set-safe-directory: true
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly
override: true
components: rustfmt
- working-directory: gir
run: cargo build --release
- run: git submodule update --checkout
- run: cargo install rustdoc-stripper
- run: python3 ./generator.py --embed-docs --yes ./
- run: git clone https://gitlab.gnome.org/World/Rust/gir-rustdoc/ # checkout action doesn't support random urls
Expand Down
2 changes: 2 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[submodule "gir"]
path = gir
url = https://github.com/gtk-rs/gir
update = none
[submodule "gir-files"]
path = gir-files
url = https://github.com/gtk-rs/gir-files
update = none
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ information about each crate, please refer to their `README.md` file in their di

## Minimum supported Rust version

Currently, the minimum supported Rust version is `1.57.0`.
Currently, the minimum supported Rust version is `1.63.0`.

## Documentation

Expand Down Expand Up @@ -41,6 +41,12 @@ file as follows:
$ python3 generator.py
```

If you didn't do so yet, please check out all the submodules before via

```bash
$ git submodule update --checkout
```

## Development

This repository is mostly split into two branches: `master` and `crate`.
Expand Down
2 changes: 1 addition & 1 deletion atk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ exclude = [
"gir-files/*",
]
edition = "2021"
rust-version = "1.57"
rust-version = "1.63"

[lib]
name = "atk"
Expand Down
2 changes: 1 addition & 1 deletion atk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ATK __2.28__ is the lowest supported version for the underlying library.

## Minimum supported Rust version

Currently, the minimum supported Rust version is `1.57.0`.
Currently, the minimum supported Rust version is `1.63.0`.

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion atk/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ name = "atk-sys"
repository = "https://github.com/gtk-rs/gtk3-rs"
version = "0.16.0"
edition = "2021"
rust-version = "1.57"
rust-version = "1.63"
[package.metadata.docs.rs]
features = ["dox"]
[package.metadata.system-deps.atk]
Expand Down
2 changes: 1 addition & 1 deletion gdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exclude = [
"gir-files/*",
]
edition = "2021"
rust-version = "1.57"
rust-version = "1.63"

[lib]
name = "gdk"
Expand Down
2 changes: 1 addition & 1 deletion gdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GDK __3.22__ is the lowest supported version for the underlying library.

## Minimum supported Rust version

Currently, the minimum supported Rust version is `1.57.0`.
Currently, the minimum supported Rust version is `1.63.0`.

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion gdk/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ name = "gdk-sys"
repository = "https://github.com/gtk-rs/gtk3-rs"
version = "0.16.0"
edition = "2021"
rust-version = "1.57"
rust-version = "1.63"
[package.metadata.docs.rs]
features = ["dox"]
[package.metadata.system-deps.gdk_3_0]
Expand Down
2 changes: 1 addition & 1 deletion gdkwayland/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "gdkwayland"
readme = "README.md"
repository = "https://github.com/gtk-rs/gtk3-rs"
version = "0.16.0"
rust-version = "1.57"
rust-version = "1.63"

[features]
v3_24 = ["ffi/v3_24", "gdk/v3_24"]
Expand Down
2 changes: 1 addition & 1 deletion gdkwayland/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GDK3-Wayland __3.22__ is the lowest supported version for the underlying library

## Minimum supported Rust version

Currently, the minimum supported Rust version is `1.57.0`.
Currently, the minimum supported Rust version is `1.63.0`.

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion gdkwayland/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name = "gdkwayland-sys"
repository = "https://github.com/gtk-rs/gtk3-rs"
version = "0.16.0"
edition = "2021"
rust-version = "1.57"
rust-version = "1.63"

[lib]
name = "gdk_wayland_sys"
Expand Down
2 changes: 1 addition & 1 deletion gdkx11/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exclude = [
"gir-files/*",
]
edition = "2021"
rust-version = "1.57"
rust-version = "1.63"

[lib]
name = "gdkx11"
Expand Down
2 changes: 1 addition & 1 deletion gdkx11/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GDKX11 __3.22__ is the lowest supported version for the underlying library.

## Minimum supported Rust version

Currently, the minimum supported Rust version is `1.57.0`.
Currently, the minimum supported Rust version is `1.63.0`.

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion gdkx11/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name = "gdkx11-sys"
version = "0.16.0"
build = "build.rs"
edition = "2021"
rust-version = "1.57"
rust-version = "1.63"
[package.metadata.docs.rs]
features = ["dox"]
[package.metadata.system-deps.gdk_x11_3_0]
Expand Down
2 changes: 1 addition & 1 deletion gtk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ exclude = [
"gir-files/*",
]
edition = "2021"
rust-version = "1.57"
rust-version = "1.63"

[lib]
name = "gtk"
Expand Down
2 changes: 1 addition & 1 deletion gtk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GTK __3.22.30__ is the lowest supported version for the underlying library.

## Minimum supported Rust version

Currently, the minimum supported Rust version is `1.57.0`.
Currently, the minimum supported Rust version is `1.63.0`.

## Building

Expand Down
2 changes: 1 addition & 1 deletion gtk/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ keywords = ["gtk", "ffi", "gtk-rs", "gnome"]
license = "MIT"
repository = "https://github.com/gtk-rs/gtk3-rs"
edition = "2021"
rust-version = "1.57"
rust-version = "1.63"
[package.metadata.docs.rs]
features = ["dox"]
[package.metadata.system-deps."gtk+_3_0"]
Expand Down
2 changes: 1 addition & 1 deletion gtk3-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ exclude = [
"gir-files/*",
"src/composite_template.ui"
]
rust-version = "1.57"
rust-version = "1.63"

[lib]
proc-macro = true
Expand Down

0 comments on commit 84d21a3

Please sign in to comment.