Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nightly CI and bump MSRV #1677

Merged
merged 2 commits into from
May 6, 2024
Merged

Fix nightly CI and bump MSRV #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60e7dff
Bump MSRV to 1.70
kchibisov May 6, 2024
282079c
ci: fix nightly warnings
kchibisov May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust_version: [1.65.0, stable, nightly]
rust_version: [1.70.0, stable, nightly]
platform:
- { target: x86_64-pc-windows-msvc, os: windows-latest, }
- { target: i686-pc-windows-msvc, os: windows-latest, }
Expand All @@ -54,10 +54,10 @@ jobs:
- { target: x86_64-apple-darwin, os: macos-latest, }
exclude:
# Android is tested on stable-3
- rust_version: '1.65.0'
- rust_version: '1.70.0'
platform: { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' }
include:
- rust_version: '1.69.0'
- rust_version: '1.70.0'
platform: { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' }


Expand Down Expand Up @@ -112,6 +112,6 @@ jobs:

- name: Lint with clippy
shell: bash
if: (matrix.rust_version == '1.65.0') && !contains(matrix.platform.options, '--no-default-features')
if: (matrix.rust_version == '1.70.0') && !contains(matrix.platform.options, '--no-default-features')
run: cargo clippy --workspace --all-targets --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES -- -Dwarnings

2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Unreleased

- Bump MSRV from `1.65` to `1.70`.

# Version 0.31.3

- Change `Surface` to be `Send`. This makes it consistent with the context, so now they are both `Send` but not `Sync`.
Expand Down
1 change: 1 addition & 0 deletions glutin-winit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ license = "MIT"
readme = "README.md"
repository = "https://github.com/rust-windowing/glutin"
edition = "2021"
rust-version = "1.70.0"

[features]
default = ["egl", "glx", "x11", "wayland", "wgl"]
Expand Down
15 changes: 15 additions & 0 deletions glutin-winit/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,19 @@ fn main() {
wgl_backend: { all(feature = "wgl", windows, not(wasm_platform)) },
cgl_backend: { all(macos_platform, not(wasm_platform)) },
}

println!("cargo:rustc-check-cfg=cfg(android_platform)");
println!("cargo:rustc-check-cfg=cfg(wasm_platform)");
println!("cargo:rustc-check-cfg=cfg(macos_platform)");
println!("cargo:rustc-check-cfg=cfg(ios_platform)");
println!("cargo:rustc-check-cfg=cfg(apple)");
println!("cargo:rustc-check-cfg=cfg(free_unix)");

println!("cargo:rustc-check-cfg=cfg(x11_platform)");
println!("cargo:rustc-check-cfg=cfg(wayland_platform)");

println!("cargo:rustc-check-cfg=cfg(egl_backend)");
println!("cargo:rustc-check-cfg=cfg(glx_backend)");
println!("cargo:rustc-check-cfg=cfg(wgl_backend)");
println!("cargo:rustc-check-cfg=cfg(cgl_backend)");
}
2 changes: 1 addition & 1 deletion glutin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-windowing/glutin"
documentation = "https://docs.rs/glutin"
rust-version = "1.65.0"
rust-version = "1.70.0"
edition = "2021"

[features]
Expand Down
15 changes: 15 additions & 0 deletions glutin/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,19 @@ fn main() {
wgl_backend: { all(feature = "wgl", windows, not(wasm_platform)) },
cgl_backend: { all(macos_platform, not(wasm_platform)) },
}

println!("cargo:rustc-check-cfg=cfg(android_platform)");
println!("cargo:rustc-check-cfg=cfg(wasm_platform)");
println!("cargo:rustc-check-cfg=cfg(macos_platform)");
println!("cargo:rustc-check-cfg=cfg(ios_platform)");
println!("cargo:rustc-check-cfg=cfg(apple)");
println!("cargo:rustc-check-cfg=cfg(free_unix)");

println!("cargo:rustc-check-cfg=cfg(x11_platform)");
println!("cargo:rustc-check-cfg=cfg(wayland_platform)");

println!("cargo:rustc-check-cfg=cfg(egl_backend)");
println!("cargo:rustc-check-cfg=cfg(glx_backend)");
println!("cargo:rustc-check-cfg=cfg(wgl_backend)");
println!("cargo:rustc-check-cfg=cfg(cgl_backend)");
}
2 changes: 1 addition & 1 deletion glutin_egl_sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "The egl bindings for glutin"
repository = "https://github.com/rust-windowing/glutin"
license = "Apache-2.0"
readme = "README.md"
rust-version = "1.65.0"
rust-version = "1.70.0"
edition = "2021"

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion glutin_examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Examples for glutin"
repository = "https://github.com/rust-windowing/glutin"
license = "Apache-2.0"
readme = "../README.md"
rust-version = "1.65.0"
rust-version = "1.70.0"
edition = "2021"
publish = false

Expand Down
15 changes: 15 additions & 0 deletions glutin_examples/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,21 @@ fn main() {
cgl_backend: { all(macos_platform, not(wasm_platform)) },
}

println!("cargo:rustc-check-cfg=cfg(android_platform)");
println!("cargo:rustc-check-cfg=cfg(wasm_platform)");
println!("cargo:rustc-check-cfg=cfg(macos_platform)");
println!("cargo:rustc-check-cfg=cfg(ios_platform)");
println!("cargo:rustc-check-cfg=cfg(apple)");
println!("cargo:rustc-check-cfg=cfg(free_unix)");

println!("cargo:rustc-check-cfg=cfg(x11_platform)");
println!("cargo:rustc-check-cfg=cfg(wayland_platform)");

println!("cargo:rustc-check-cfg=cfg(egl_backend)");
println!("cargo:rustc-check-cfg=cfg(glx_backend)");
println!("cargo:rustc-check-cfg=cfg(wgl_backend)");
println!("cargo:rustc-check-cfg=cfg(cgl_backend)");

let dest = PathBuf::from(&env::var("OUT_DIR").unwrap());

println!("cargo:rerun-if-changed=build.rs");
Expand Down
2 changes: 1 addition & 1 deletion glutin_gles2_sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "The gles2 bindings for glutin"
repository = "https://github.com/rust-windowing/glutin"
license = "Apache-2.0"
readme = "README.md"
rust-version = "1.65.0"
rust-version = "1.70.0"
edition = "2021"

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion glutin_glx_sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "The glx bindings for glutin"
repository = "https://github.com/rust-windowing/glutin"
license = "Apache-2.0"
readme = "README.md"
rust-version = "1.65.0"
rust-version = "1.70.0"
edition = "2021"

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion glutin_wgl_sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "The wgl bindings for glutin"
repository = "https://github.com/rust-windowing/glutin"
license = "Apache-2.0"
readme = "README.md"
rust-version = "1.65.0"
rust-version = "1.70.0"
edition = "2021"

[build-dependencies]
Expand Down
Loading