From 197bc3080e6a1759e912950dfde8e9762ef21354 Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Thu, 9 Mar 2023 14:15:40 +0100 Subject: [PATCH] ash-window: Bump MSRV to 1.64 to match `raw-window-handle 0.5.1` `raw-window-handle 0.5.1` bumped from 1.60 to 1.64 in a semver-compatible release, failing our CI infrastructure overnight. Keep the `ash` version at `1.60` for now. --- .github/workflows/ci.yml | 15 +++++++++++++-- README.md | 1 + ash-window/Cargo.toml | 2 +- ash-window/Changelog.md | 2 +- ash-window/README.md | 1 + 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 937ef1f03..2e956b178 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: args: --workspace --all-targets --all-features check_msrv: - name: Check MSRV (1.60.0) + name: Check ash MSRV (1.60.0) runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 @@ -27,7 +27,18 @@ jobs: - uses: actions-rs/cargo@v1 with: command: check - args: -p ash -p ash-window --all-features + args: -p ash --all-features + + check_ash_window_msrv: + name: Check ash-window MSRV (1.64.0) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: dtolnay/rust-toolchain@1.64.0 + - uses: actions-rs/cargo@v1 + with: + command: check + args: -p ash-window -p examples --all-features generated: name: Generated diff --git a/README.md b/README.md index 12c0892ce..513519c92 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ A very lightweight wrapper around Vulkan [![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE-MIT) [![LICENSE](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](LICENSE-APACHE) [![Join the chat at https://gitter.im/MaikKlein/ash](https://badges.gitter.im/MaikKlein/ash.svg)](https://gitter.im/MaikKlein/ash?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![MSRV](https://img.shields.io/badge/rustc-1.60.0+-ab6000.svg)](https://blog.rust-lang.org/2022/04/07/Rust-1.60.0.html) ## Overview - [x] A true Vulkan API without compromises diff --git a/ash-window/Cargo.toml b/ash-window/Cargo.toml index 2efd37c16..76ad7c154 100644 --- a/ash-window/Cargo.toml +++ b/ash-window/Cargo.toml @@ -12,7 +12,7 @@ categories = ["game-engines", "graphics"] exclude = [".github/*"] workspace = ".." edition = "2021" -rust-version = "1.60.0" +rust-version = "1.64.0" [dependencies] ash = { path = "../ash", version = "0.37", default-features = false } diff --git a/ash-window/Changelog.md b/ash-window/Changelog.md index e97f1aa8e..ec2cbbf8f 100644 --- a/ash-window/Changelog.md +++ b/ash-window/Changelog.md @@ -2,7 +2,7 @@ ## [Unreleased] - ReleaseDate -- Bumped MSRV from 1.59 to 1.60 (#709) +- Bumped MSRV from 1.59 to 1.64 for `winit 0.28` and `raw-window-handle 0.5.1`. (#709, #716) ## [0.12.0] - 2022-09-23 diff --git a/ash-window/README.md b/ash-window/README.md index fcf298cbf..6e7d699fc 100644 --- a/ash-window/README.md +++ b/ash-window/README.md @@ -8,6 +8,7 @@ Interoperability between [`ash`](https://github.com/MaikKlein/ash) and [`raw-win [![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE-MIT) [![LICENSE](https://img.shields.io/badge/license-apache-blue.svg)](LICENSE-APACHE) [![Join the chat at https://gitter.im/MaikKlein/ash](https://badges.gitter.im/MaikKlein/ash.svg)](https://gitter.im/MaikKlein/ash?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![MSRV](https://img.shields.io/badge/rustc-1.64.0+-ab6000.svg)](https://blog.rust-lang.org/2022/09/22/Rust-1.64.0.html) ## Usage