Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit def1335

Browse files
committedAug 16, 2022
Merge upstream
2 parents b7bc945 + 76f158d commit def1335

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+3978
-2470
lines changed
 

‎.github/CODEOWNERS

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Core maintainers:
2+
# - @msiglreith
3+
# - @kchibisov
4+
# - @madsmtm
5+
# - @maroider
6+
7+
# Android
8+
/src/platform/android.rs @msiglreith
9+
/src/platform_impl/android @msiglreith
10+
11+
# iOS
12+
/src/platform/ios.rs @francesca64
13+
/src/platform_impl/ios @francesca64
14+
15+
# Unix in general
16+
/src/platform/unix.rs @kchibisov
17+
/src/platform_impl/linux/mod.rs @kchibisov
18+
19+
# Wayland
20+
/src/platform_impl/linux/wayland @kchibisov
21+
22+
# X11
23+
/src/platform_impl/linux/x11 @kchibisov
24+
25+
# macOS
26+
/src/platform/macos.rs @madsmtm
27+
/src/platform_impl/macos @madsmtm
28+
29+
# Web (no maintainer)
30+
/src/platform/web.rs
31+
/src/platform_impl/web
32+
33+
# Windows
34+
/src/platform/windows.rs @msiglreith
35+
/src/platform_impl/windows @msiglreith

‎.github/workflows/ci.yml

+20-12
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ jobs:
1717
- name: Check Formatting
1818
run: cargo +stable fmt --all -- --check
1919

20-
Tests:
20+
tests:
21+
name: Tests
2122
strategy:
2223
fail-fast: false
2324
matrix:
24-
rust_version: [stable, nightly]
25+
rust_version: [1.57.0, stable, nightly]
2526
platform:
27+
# Note: Make sure that we test all the `docs.rs` targets defined in Cargo.toml!
2628
- { target: x86_64-pc-windows-msvc, os: windows-latest, }
2729
- { target: i686-pc-windows-msvc, os: windows-latest, }
2830
- { target: x86_64-pc-windows-gnu, os: windows-latest, host: -x86_64-pc-windows-gnu }
@@ -42,10 +44,12 @@ jobs:
4244
env:
4345
RUST_BACKTRACE: 1
4446
CARGO_INCREMENTAL: 0
47+
PKG_CONFIG_ALLOW_CROSS: 1
4548
RUSTFLAGS: "-C debuginfo=0 --deny warnings"
4649
OPTIONS: ${{ matrix.platform.options }}
4750
FEATURES: ${{ format(',{0}', matrix.platform.features ) }}
4851
CMD: ${{ matrix.platform.cmd }}
52+
RUSTDOCFLAGS: -Dwarnings
4953

5054
runs-on: ${{ matrix.platform.os }}
5155
steps:
@@ -61,22 +65,26 @@ jobs:
6165
with:
6266
rust-version: ${{ matrix.rust_version }}${{ matrix.platform.host }}
6367
targets: ${{ matrix.platform.target }}
68+
components: clippy
6469

70+
- name: Setup NDK path
71+
shell: bash
72+
# "Temporary" workaround until https://github.com/actions/virtual-environments/issues/5879#issuecomment-1195156618
73+
# gets looked into.
74+
run: echo "ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME" >> $GITHUB_ENV
75+
- name: Install Linux dependencies
76+
if: (matrix.platform.os == 'ubuntu-latest')
77+
run: sudo apt-get update && sudo apt-get install pkg-config cmake libfreetype6-dev libfontconfig1-dev
6578
- name: Install GCC Multilib
6679
if: (matrix.platform.os == 'ubuntu-latest') && contains(matrix.platform.target, 'i686')
67-
run: sudo apt-get update && sudo apt-get install gcc-multilib
80+
run: sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install g++-multilib gcc-multilib libfreetype6-dev:i386 libfontconfig1-dev:i386
6881
- name: Install cargo-apk
6982
if: contains(matrix.platform.target, 'android')
7083
run: cargo install cargo-apk
7184

7285
- name: Check documentation
7386
shell: bash
74-
if: matrix.platform.target != 'wasm32-unknown-unknown'
75-
run: cargo $CMD doc --no-deps --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
76-
77-
- name: Build
78-
shell: bash
79-
run: cargo $CMD build --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
87+
run: cargo $CMD doc --no-deps --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES --document-private-items
8088

8189
- name: Build tests
8290
shell: bash
@@ -89,10 +97,10 @@ jobs:
8997
!contains(matrix.platform.target, 'wasm32'))
9098
run: cargo $CMD test --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
9199

92-
93-
- name: Build with serde enabled
100+
- name: Lint with clippy
94101
shell: bash
95-
run: cargo $CMD build --verbose --target ${{ matrix.platform.target }} $OPTIONS --features serde,$FEATURES
102+
if: (matrix.rust_version == '1.57.0') && !contains(matrix.platform.options, '--no-default-features')
103+
run: cargo clippy --all-targets --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES -- -Dwarnings
96104

97105
- name: Build tests with serde enabled
98106
shell: bash

0 commit comments

Comments
 (0)
Please sign in to comment.