From 4120100772f3197c3a2026fea298c5042717889e Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Fri, 5 Apr 2024 05:28:14 +0200 Subject: [PATCH] Add CI --- .github/workflows/ci.yml | 33 +++++++++++++++++++++++++++++++++ Cargo.lock | 2 ++ Cargo.toml | 4 ++-- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..d664758 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,33 @@ +name: CI + +on: [push, pull_request] + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Dependencies + run: | + sudo apt-get update + sudo apt-get install libwpe-1.0-1 libwpebackend-fdo-1.0-1 libwpewebkit-1.0-3 + - uses: actions/checkout@v2 + - name: Stable + run: cargo test + - name: Oldstable + run: | + oldstable=$(cat Cargo.toml | grep "rust-version" | sed 's/.*"\(.*\)".*/\1/') + rustup toolchain install --profile minimal $oldstable + rustup default $oldstable + cargo test + - name: Clippy + run: | + rustup component add clippy + cargo clippy --all-targets + - name: Rustfmt + run: | + rustup toolchain install nightly -c rustfmt + cargo +nightly fmt -- --check diff --git a/Cargo.lock b/Cargo.lock index 4c4a618..7d44641 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -449,6 +449,7 @@ dependencies = [ [[package]] name = "glutin" version = "0.31.3" +source = "git+https://github.com/chrisduerr/glutin?branch=more_egl#452db72e14c085896d1fc6c5b6b35bd664169acd" dependencies = [ "bitflags 2.4.2", "cfg_aliases", @@ -467,6 +468,7 @@ dependencies = [ [[package]] name = "glutin_egl_sys" version = "0.6.0" +source = "git+https://github.com/chrisduerr/glutin?branch=more_egl#452db72e14c085896d1fc6c5b6b35bd664169acd" dependencies = [ "gl_generator", "windows-sys 0.48.0", diff --git a/Cargo.toml b/Cargo.toml index 126a589..222fad4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,8 +22,8 @@ members = [ [dependencies] funq = { path = "./funq" } -glutin_egl_sys = { path = "../../rust-windowing/glutin/glutin_egl_sys" } -glutin = { path = "../../rust-windowing/glutin/glutin", default-features = false, features = ["wayland"] } +glutin_egl_sys = { git = "https://github.com/chrisduerr/glutin", branch = "more_egl" } +glutin = { git = "https://github.com/chrisduerr/glutin", branch = "more_egl", default-features = false, features = ["wayland"] } raw-window-handle = "0.5.2" smithay-client-toolkit = { version = "0.18.1", default-features = false, features = ["xkbcommon"] } thiserror = "1.0.57"