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

feat(ci): add OpenHarmony ci support #1703

Closed
wants to merge 11 commits into from
Closed

feat(ci): add OpenHarmony ci support #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1623bf4
feat(ci): add OpenHarmony ci support
richerfu Sep 24, 2024
09aa037
skip ohos for 1.70.0
richerfu Sep 24, 2024
b053aa9
update ci
richerfu Sep 24, 2024
59af57d
update ci
richerfu Sep 24, 2024
50d58b2
update ci
richerfu Sep 24, 2024
5b6579e
fix: support test
richerfu Sep 24, 2024
8c758bf
update ci
richerfu Sep 25, 2024
107e13c
docs: add docs
richerfu Sep 25, 2024
91b5321
upgrade ci
richerfu Sep 26, 2024
a2672cb
upgrade ci
richerfu Sep 26, 2024
b37b452
fix: windows clippy warning
richerfu Sep 26, 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
48 changes: 24 additions & 24 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,31 @@ jobs:
strategy:
fail-fast: false
matrix:
rust_version: [1.70.0, stable, nightly]
rust_version: [1.78.0, stable, nightly]
platform:
- { target: x86_64-pc-windows-msvc, os: windows-latest, }
- { target: i686-pc-windows-msvc, os: windows-latest, }
- { target: i686-pc-windows-msvc, os: windows-latest, options: --no-default-features, features: wgl }
- { target: i686-pc-windows-msvc, os: windows-latest, options: --no-default-features, features: egl }
- { target: x86_64-pc-windows-gnu, os: windows-latest, host: -x86_64-pc-windows-gnu }
- { target: i686-pc-windows-gnu, os: windows-latest, host: -i686-pc-windows-gnu }
- { target: i686-unknown-linux-gnu, os: ubuntu-latest, }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "egl,wayland,x11" }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "egl,wayland" }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "egl,x11" }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: glx }
- { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' }
- { target: x86_64-apple-darwin, os: macos-latest, }
- { target: x86_64-pc-windows-msvc, os: windows-latest, }
- { target: i686-pc-windows-msvc, os: windows-latest, }
- { target: i686-pc-windows-msvc, os: windows-latest, options: --no-default-features, features: wgl }
- { target: i686-pc-windows-msvc, os: windows-latest, options: --no-default-features, features: egl }
- { target: x86_64-pc-windows-gnu, os: windows-latest, host: -x86_64-pc-windows-gnu }
- { target: i686-pc-windows-gnu, os: windows-latest, host: -i686-pc-windows-gnu }
- { target: i686-unknown-linux-gnu, os: ubuntu-latest, }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "egl,wayland,x11" }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "egl,wayland" }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "egl,x11" }
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: glx }
- { target: aarch64-unknown-linux-ohos, os: ubuntu-latest, }
- { target: x86_64-unknown-linux-ohos, os: ubuntu-latest, }
- { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' }
- { target: x86_64-apple-darwin, os: macos-latest, }
exclude:
# Android is tested on stable-3
- rust_version: '1.70.0'
platform: { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' }
- rust_version: '1.78.0'
platform: { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' }
include:
- rust_version: '1.70.0'
platform: { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' }
- rust_version: '1.78.0'
platform: { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' }


env:
Expand Down Expand Up @@ -100,15 +102,13 @@ jobs:
if: contains(matrix.platform.target, 'android')
run: cargo +stable install cargo-apk

- name: Build tests
shell: bash
run: cargo $CMD test -p glutin --no-run --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
- name: Run tests
shell: bash
if: (
!contains(matrix.platform.target, 'android') &&
!contains(matrix.platform.target, 'ios') &&
!contains(matrix.platform.target, 'wasm32'))
!contains(matrix.platform.target, 'wasm32') &&
!contains(matrix.platform.target, 'ohos'))
run: cargo test --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES

- name: Check documentation
Expand All @@ -117,6 +117,6 @@ jobs:

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

1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- Properly set up OpenGL-specific stuff on the `NSView`, instead of relying on Winit to do it.
- Added `OpenHarmony` platform support with EGL.
- Added support for `Display::create_pbuffer_surface()` in WGL via `WGL_ARB_pbuffer`.
- Added `OpenHarmony` platform some logic for CI.

# Version 0.32.0

Expand Down
3 changes: 2 additions & 1 deletion glutin-winit/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ fn main() {
cfg_aliases! {
// Systems.
android_platform: { target_os = "android" },
ohos_platform: { target_env = "ohos" },
wasm_platform: { target_family = "wasm" },
macos_platform: { target_os = "macos" },
ios_platform: { target_os = "ios" },
apple: { any(ios_platform, macos_platform) },
free_unix: { all(unix, not(apple), not(android_platform)) },
free_unix: { all(unix, not(apple), not(android_platform), not(ohos_platform)) },

// Native displays.
x11_platform: { all(feature = "x11", free_unix, not(wasm_platform)) },
Expand Down
1 change: 1 addition & 0 deletions glutin_wgl_sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#![allow(clippy::missing_safety_doc)]
#![allow(clippy::manual_non_exhaustive)]
#![allow(clippy::unnecessary_cast)]
#![allow(unused_imports)]

/// WGL bindings
pub mod wgl {
Expand Down
Loading