From 623e0d0a97d993685df95359f390c8289eb8202f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 4 Sep 2022 10:22:37 +0300 Subject: [PATCH 1/2] Update minimum supported Rust version to 1.63 --- .github/workflows/CI.yml | 4 ++-- README.md | 2 +- atk/Cargo.toml | 2 +- atk/README.md | 2 +- atk/sys/Cargo.toml | 2 +- gdk/Cargo.toml | 2 +- gdk/README.md | 2 +- gdk/sys/Cargo.toml | 2 +- gdkwayland/Cargo.toml | 2 +- gdkwayland/README.md | 2 +- gdkwayland/sys/Cargo.toml | 2 +- gdkx11/Cargo.toml | 2 +- gdkx11/README.md | 2 +- gdkx11/sys/Cargo.toml | 2 +- gtk/Cargo.toml | 2 +- gtk/README.md | 2 +- gtk/sys/Cargo.toml | 2 +- gtk3-macros/Cargo.toml | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e87ba87096e6..4f22871bf585 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -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 } @@ -98,7 +98,7 @@ jobs: - stable - beta - nightly - - "1.57.0" + - "1.63.0" steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 diff --git a/README.md b/README.md index afd227fac725..df3063b324f4 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/atk/Cargo.toml b/atk/Cargo.toml index 559ca17ec1df..7c13de8858fd 100644 --- a/atk/Cargo.toml +++ b/atk/Cargo.toml @@ -14,7 +14,7 @@ exclude = [ "gir-files/*", ] edition = "2021" -rust-version = "1.57" +rust-version = "1.63" [lib] name = "atk" diff --git a/atk/README.md b/atk/README.md index 6d6461cc1726..88fea6023c48 100644 --- a/atk/README.md +++ b/atk/README.md @@ -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 diff --git a/atk/sys/Cargo.toml b/atk/sys/Cargo.toml index 3045113781b8..488fbfc614fb 100644 --- a/atk/sys/Cargo.toml +++ b/atk/sys/Cargo.toml @@ -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] diff --git a/gdk/Cargo.toml b/gdk/Cargo.toml index 2f4895917eec..ec93c3ecb363 100644 --- a/gdk/Cargo.toml +++ b/gdk/Cargo.toml @@ -13,7 +13,7 @@ exclude = [ "gir-files/*", ] edition = "2021" -rust-version = "1.57" +rust-version = "1.63" [lib] name = "gdk" diff --git a/gdk/README.md b/gdk/README.md index 9fc8b882f604..3c12995fb102 100644 --- a/gdk/README.md +++ b/gdk/README.md @@ -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 diff --git a/gdk/sys/Cargo.toml b/gdk/sys/Cargo.toml index b580c729ac5e..a7334d064bd0 100644 --- a/gdk/sys/Cargo.toml +++ b/gdk/sys/Cargo.toml @@ -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] diff --git a/gdkwayland/Cargo.toml b/gdkwayland/Cargo.toml index 44d6c536601c..6df8fbb98a07 100644 --- a/gdkwayland/Cargo.toml +++ b/gdkwayland/Cargo.toml @@ -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"] diff --git a/gdkwayland/README.md b/gdkwayland/README.md index 9458b7796be4..e0b29d32a078 100644 --- a/gdkwayland/README.md +++ b/gdkwayland/README.md @@ -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 diff --git a/gdkwayland/sys/Cargo.toml b/gdkwayland/sys/Cargo.toml index 999f2270857c..6a8ae16cb189 100644 --- a/gdkwayland/sys/Cargo.toml +++ b/gdkwayland/sys/Cargo.toml @@ -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" diff --git a/gdkx11/Cargo.toml b/gdkx11/Cargo.toml index 4deb6cd10ffa..aa60a9df9173 100644 --- a/gdkx11/Cargo.toml +++ b/gdkx11/Cargo.toml @@ -13,7 +13,7 @@ exclude = [ "gir-files/*", ] edition = "2021" -rust-version = "1.57" +rust-version = "1.63" [lib] name = "gdkx11" diff --git a/gdkx11/README.md b/gdkx11/README.md index 5dc1dcee9500..9706fc2cbff1 100644 --- a/gdkx11/README.md +++ b/gdkx11/README.md @@ -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 diff --git a/gdkx11/sys/Cargo.toml b/gdkx11/sys/Cargo.toml index c6ccfaa33ecb..7e69eed4d62c 100644 --- a/gdkx11/sys/Cargo.toml +++ b/gdkx11/sys/Cargo.toml @@ -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] diff --git a/gtk/Cargo.toml b/gtk/Cargo.toml index 809b129efef7..1ea4a51c0b9d 100644 --- a/gtk/Cargo.toml +++ b/gtk/Cargo.toml @@ -15,7 +15,7 @@ exclude = [ "gir-files/*", ] edition = "2021" -rust-version = "1.57" +rust-version = "1.63" [lib] name = "gtk" diff --git a/gtk/README.md b/gtk/README.md index 7670d655bb8f..897f85761318 100644 --- a/gtk/README.md +++ b/gtk/README.md @@ -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 diff --git a/gtk/sys/Cargo.toml b/gtk/sys/Cargo.toml index cff5775c72ba..8bf80bbef757 100644 --- a/gtk/sys/Cargo.toml +++ b/gtk/sys/Cargo.toml @@ -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"] diff --git a/gtk3-macros/Cargo.toml b/gtk3-macros/Cargo.toml index aefa29584fdc..0eb7f135fcf2 100644 --- a/gtk3-macros/Cargo.toml +++ b/gtk3-macros/Cargo.toml @@ -14,7 +14,7 @@ exclude = [ "gir-files/*", "src/composite_template.ui" ] -rust-version = "1.57" +rust-version = "1.63" [lib] proc-macro = true From ec9a3618fe9901c91df6f020c60713579b3553f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 4 Sep 2022 10:19:10 +0300 Subject: [PATCH 2/2] 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. --- .github/workflows/CI.yml | 2 ++ .github/workflows/docs.yml | 6 +++--- .gitmodules | 2 ++ README.md | 6 ++++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4f22871bf585..824250415752 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -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 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 5ec3cfb8392e..95aca8d3f51e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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 @@ -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 diff --git a/.gitmodules b/.gitmodules index 4a69cd13287a..0753166c32fe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/README.md b/README.md index df3063b324f4..7be70a2701c0 100644 --- a/README.md +++ b/README.md @@ -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`.