Skip to content

Commit d372e67

Browse files
committed
Add check workflow
1 parent 7725f3e commit d372e67

File tree

6 files changed

+89
-7
lines changed

6 files changed

+89
-7
lines changed

.github/workflows/check.yml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
8+
9+
env:
10+
CARGO_TERM_COLOR: always
11+
RUSTFLAGS: -D warnings
12+
RUSTDOCFLAGS: -D warnings
13+
14+
jobs:
15+
tests:
16+
strategy:
17+
matrix:
18+
os: [ubuntu-latest, macos-latest, windows-latest]
19+
features:
20+
- winit
21+
- gl
22+
- winit,gl
23+
- vulkan
24+
include:
25+
- os: macos-latest
26+
features: "winit,gl,metal"
27+
runs-on: ${{ matrix.os }}
28+
steps:
29+
- uses: actions/checkout@v3
30+
31+
- name: Set up cargo cache
32+
uses: Swatinem/rust-cache@v2
33+
34+
- name: Clippy
35+
uses: actions-rs/cargo@v1
36+
with:
37+
command: clippy
38+
args: --all-targets --features ${{ matrix.features }} -- -D warnings
39+
40+
- name: RustFmt
41+
uses: actions-rs/cargo@v1
42+
with:
43+
command: fmt
44+
args: --features ${{ matrix.features }} -- --check
45+
46+
- name: Test
47+
uses: actions-rs/cargo@v1
48+
with:
49+
command: test
50+
args: --features ${{ matrix.features }}
51+
52+
- name: Cargo Doc
53+
if: ${{ matrix.os == 'ubuntu-latest' }}
54+
uses: actions-rs/cargo@v1
55+
with:
56+
command: doc
57+
args: --lib --no-deps --features ${{ matrix.features }}
58+
59+
miri:
60+
runs-on: ubuntu-latest
61+
steps:
62+
- uses: actions/checkout@v3
63+
64+
- name: Install Miri
65+
uses: actions-rs/toolchain@v1
66+
with:
67+
toolchain: nightly
68+
override: true
69+
components: miri
70+
71+
# Separate miri setup from run so that 'Miri Test'
72+
# logs are clean.
73+
- name: Setup Miri
74+
uses: actions-rs/cargo@v1
75+
with:
76+
command: miri
77+
args: setup
78+
79+
- name: Miri Test
80+
uses: actions-rs/cargo@v1
81+
with:
82+
command: miri
83+
args: test --features winit

Cargo.lock

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ egui-winit = { version = ">=0.20", optional = true, default-features = false }
3232
skulpin = { version = ">=0.14.1", features = [], optional = true}
3333

3434
[dev-dependencies]
35-
softbuffer = { git = "https://github.com/john01dav/softbuffer" }
35+
softbuffer = "0.2.0"
3636
egui_demo_lib = ">=0.20"
3737
raw-window-handle = "0.5"
3838
foreign-types-shared = "0.1.1"

examples/sdl2_opengl.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use egui_sdl2_event::DpiMode;
2-
31
/// This is a mix of the rust-sdl2 opengl example,
42
/// the skia-safe gl window example: https://github.com/rust-skia/rust-skia/blob/master/skia-safe/examples/gl-window/main.rs
53
/// and the egui-sdl2-event example: https://github.com/kaphula/egui-sdl2-event-example
@@ -8,6 +6,7 @@ fn main() {
86
extern crate gl;
97
extern crate sdl2;
108

9+
use egui_sdl2_event::DpiMode;
1110
use egui_sdl2_event::EguiSDL2State;
1211
use sdl2::event::{Event, WindowEvent};
1312
use sdl2::keyboard::Keycode;

examples/sdl2_vulkan.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// This example shows how to use the renderer with SDL2 directly.
22

3-
use egui_sdl2_event::DpiMode;
4-
53
#[cfg(feature = "vulkan")]
64
fn main() {
5+
use egui_sdl2_event::DpiMode;
76
use egui_sdl2_event::EguiSDL2State;
87
use sdl2::event::Event;
98
use sdl2::keyboard::Keycode;

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ mod egui_skia_winit;
88
#[cfg(feature = "winit")]
99
pub use egui_skia_winit::EguiSkiaWinit;
1010

11-
pub use egui_skia::*;
11+
pub use crate::egui_skia::*;
1212
pub use painter::EguiSkiaPaintCallback;

0 commit comments

Comments
 (0)